Merge pull request #1467 from openmv/pico-update

Update pico-sdk to 1.3.0 and tinyusb 0.12.0
This commit is contained in:
Ibrahim Abd Elkader 2021-11-21 21:15:04 +02:00 committed by GitHub
commit daec5e2799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 29 deletions

View File

@ -38,9 +38,6 @@ script:
CMAKE_URL="https://cmake.org/files/v3.20/cmake-3.20.0-linux-x86_64.tar.gz"
wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${HOME}/cmake
export PATH=${HOME}/cmake/bin:${PATH}
# Patch Nano RP2040 header to fix the flash issue.
patch -p1 -s -f -r- src/micropython/lib/pico-sdk/src/boards/include/boards/arduino_nano_rp2040_connect.h\
src/patches/0001-Use-W25Q080-second-stage-loader-for-Nano-RP2040-Conn.patch
fi
# Build the firmware.
- make -j$(nproc) -C src/micropython/mpy-cross

@ -1 +1 @@
Subproject commit 7ecbe3de554b746cd310cf0a7264e193953b2c2b
Subproject commit 2bbe0bcb7ed7103fdd808d1332aaeef10a44064e

View File

@ -1,25 +0,0 @@
From 8571ccf53d80c3313f9b6a49d2ed7eae504de729 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 26 Aug 2021 20:07:30 +0200
Subject: [PATCH] Use W25Q080 second stage loader for Nano RP2040 Connect.
---
arduino_nano_rp2040_connect.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arduino_nano_rp2040_connect.h b/arduino_nano_rp2040_connect.h
index 9725cb7..24f52a1 100644
--- a/arduino_nano_rp2040_connect.h
+++ b/arduino_nano_rp2040_connect.h
@@ -66,7 +66,7 @@
//------------- FLASH -------------//
-#define PICO_BOOT_STAGE2_CHOOSE_AT25SF128A 1
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
#ifndef PICO_FLASH_SPI_CLKDIV
#define PICO_FLASH_SPI_CLKDIV 2
--
2.32.0