Merge pull request #9831 from eightycc/issue-9829

Update Raspberry Pi Pico SDK to 2.1.0
adafruit · Nov 26, 2024 · 01facb6 · 01facb6
2 parents 5a74d91 + 43339e5
commit 01facb6
Show file tree

Hide file tree

Showing 14 changed files with 142 additions and 19 deletions.
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
@@ -21,7 +21,19 @@ INC_CYW43 := \
 	-isystem sdk/src/rp2_common/pico_lwip/include/ \
 	-isystem sdk/src/rp2_common/pico_rand/include/ \
 
-CFLAGS_CYW43 := -DCYW43_LWIP=1 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_USE_SPI -DIGNORE_GPIO25 -DIGNORE_GPIO23 -DIGNORE_GPIO24 -DCYW43_LOGIC_DEBUG=0 -DCYW43_USE_STATS=0 -DPICO_BUILD -DCYW43_ENABLE_BLUETOOTH=0 -DPICO_CYW43_ARCH_POLL=0
+CFLAGS_CYW43 := \
+	-DCYW43_LWIP=1 \
+	-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 \
+	-DCYW43_USE_SPI \
+	-DIGNORE_GPIO25 \
+	-DIGNORE_GPIO23 \
+	-DIGNORE_GPIO24 \
+	-DCYW43_LOGIC_DEBUG=0 \
+	-DCYW43_USE_STATS=0 \
+	-DPICO_BUILD \
+	-DCYW43_ENABLE_BLUETOOTH=0 \
+	-DPICO_CYW43_ARCH_POLL=0
+
 SRC_SDK_CYW43 := \
 	src/common/pico_sync/sem.c \
 	src/rp2_common/pico_async_context/async_context_base.c \
@@ -93,6 +105,7 @@ INC += \
 	-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_regs/include/ \
 	-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_structs/include/ \
 	-isystem sdk/src/$(CHIP_VARIANT_LOWER)/pico_platform/include/ \
+	-isystem sdk/src/rp2_common/boot_bootrom_headers/include/ \
 	-isystem sdk/src/rp2_common/cmsis/ \
 	-isystem sdk/src/rp2_common/hardware_adc/include/ \
 	-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -120,10 +133,12 @@ INC += \
 	-isystem sdk/src/rp2_common/hardware_vreg/include/ \
 	-isystem sdk/src/rp2_common/hardware_watchdog/include/ \
 	-isystem sdk/src/rp2_common/hardware_xosc/include/ \
+	-isystem sdk/src/rp2_common/hardware_xip_cache/include/ \
 	-isystem sdk/src/rp2_common/pico_aon_timer/include/ \
 	-isystem sdk/src/rp2_common/pico_atomic/include/ \
 	-isystem sdk/src/rp2_common/pico_bootrom/include/ \
 	-isystem sdk/src/rp2_common/pico_double/include/ \
+	-isystem sdk/src/rp2_common/pico_flash/include/ \
 	-isystem sdk/src/rp2_common/pico_mem_ops/include/ \
 	-isystem sdk/src/rp2_common/pico_multicore/include/ \
 	-isystem sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include/ \
@@ -483,6 +498,7 @@ SRC_SDK := \
 	src/rp2_common/hardware_uart/uart.c \
 	src/rp2_common/hardware_vreg/vreg.c \
 	src/rp2_common/hardware_watchdog/watchdog.c \
+	src/rp2_common/hardware_xip_cache/xip_cache.c \
 	src/rp2_common/hardware_xosc/xosc.c \
 	src/rp2_common/pico_aon_timer/aon_timer.c \
 	src/rp2_common/pico_atomic/atomic.c \

diff --git a/ports/raspberrypi/boards/cytron_edu_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/cytron_edu_pico_w/mpconfigboard.mk
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
 
 CIRCUITPY_PICODVI = 1
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/pajenicko_picopad/mpconfigboard.mk b/ports/raspberrypi/boards/pajenicko_picopad/mpconfigboard.mk
@@ -28,6 +28,16 @@ CIRCUITPY_PICODVI = 1
 # Pimoroni PicoSystem peripherals are compatible, we can use of existing ugame.py
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/picosystem
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk
@@ -22,7 +22,17 @@ CIRCUITPY_WIFI = 1
 CIRCUITPY_PICODVI = 0
 CIRCUITPY_USB_HOST = 0
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
 CIRCUITPY_PICODVI = 0
 CIRCUITPY_USB_HOST = 0
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
 CIRCUITPY_PICODVI = 0
 CIRCUITPY_USB_HOST = 0
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
 
 CIRCUITPY_PICODVI = 1
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/pimoroni_pico_plus2w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pico_plus2w/mpconfigboard.mk
@@ -21,11 +21,17 @@ CIRCUITPY_WIFI = 1
 
 # PIO clock divider set to 2 (default), consider changing if TM2 gSPI
 # becomes unreliable.
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 \
-          -DCYW43_PIN_WL_REG_ON=23 \
-		  -DCYW43_WL_GPIO_COUNT=3 \
-		  -DCYW43_WL_GPIO_LED_PIN=0 \
-		  -DCYW43_PIO_CLOCK_DIV_INT=2 \
-		  -DCYW43_PIO_CLOCK_DIV_FRAC=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0 \
+	-DCYW43_PIO_CLOCK_DIV_INT=2 \
+	-DCYW43_PIO_CLOCK_DIV_FRAC=0
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
 CIRCUITPY_PICODVI = 0
 CIRCUITPY_USB_HOST = 0
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
 

diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico2_w/mpconfigboard.mk
@@ -19,6 +19,17 @@ CIRCUITPY_MDNS = 1
 CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0 -DCYW43_PIO_CLOCK_DIV_INT=3
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0 \
+	-DCYW43_PIO_CLOCK_DIV_INT=3
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico_w/mpconfigboard.mk
@@ -21,6 +21,16 @@ CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2350/mpconfigboard.mk
@@ -24,6 +24,16 @@ CIRCUITPY_SOCKETPOOL = 1
 CIRCUITPY_WIFI = 1
 
 
-CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
+CFLAGS += \
+    -DCYW43_PIN_WL_DYNAMIC=0 \
+	-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
+	-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
+	-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
+	-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
+	-DCYW43_DEFAULT_PIN_WL_CS=25 \
+	-DCYW43_WL_GPIO_COUNT=3 \
+	-DCYW43_WL_GPIO_LED_PIN=0
+
 # Must be accompanied by a linker script change
 CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
diff --git a/ports/raspberrypi/lib/cyw43-driver b/ports/raspberrypi/lib/cyw43-driver
diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
+1 −1		firmware/wifi_nvram_43439.h
+10 −3		src/cyw43.h
+2 −1		src/cyw43_lwip.c