Skip to content

Commit 01facb6

Browse files
tannewttannewt
authored
Merge pull request #9831 from eightycc/issue-9829
Update Raspberry Pi Pico SDK to 2.1.0
2 parents 5a74d91 + 43339e5 commit 01facb6

14 files changed

Lines changed: 142 additions & 19 deletions

File tree

‎ports/raspberrypi/Makefile‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,19 @@ INC_CYW43 := \
2121
-isystem sdk/src/rp2_common/pico_lwip/include/ \
2222
-isystem sdk/src/rp2_common/pico_rand/include/ \
2323

24-
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
24+
CFLAGS_CYW43 := \
25+
-DCYW43_LWIP=1 \
26+
-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 \
27+
-DCYW43_USE_SPI \
28+
-DIGNORE_GPIO25 \
29+
-DIGNORE_GPIO23 \
30+
-DIGNORE_GPIO24 \
31+
-DCYW43_LOGIC_DEBUG=0 \
32+
-DCYW43_USE_STATS=0 \
33+
-DPICO_BUILD \
34+
-DCYW43_ENABLE_BLUETOOTH=0 \
35+
-DPICO_CYW43_ARCH_POLL=0
36+
2537
SRC_SDK_CYW43 := \
2638
src/common/pico_sync/sem.c \
2739
src/rp2_common/pico_async_context/async_context_base.c \
@@ -93,6 +105,7 @@ INC += \
93105
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_regs/include/ \
94106
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_structs/include/ \
95107
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/pico_platform/include/ \
108+
-isystem sdk/src/rp2_common/boot_bootrom_headers/include/ \
96109
-isystem sdk/src/rp2_common/cmsis/ \
97110
-isystem sdk/src/rp2_common/hardware_adc/include/ \
98111
-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -120,10 +133,12 @@ INC += \
120133
-isystem sdk/src/rp2_common/hardware_vreg/include/ \
121134
-isystem sdk/src/rp2_common/hardware_watchdog/include/ \
122135
-isystem sdk/src/rp2_common/hardware_xosc/include/ \
136+
-isystem sdk/src/rp2_common/hardware_xip_cache/include/ \
123137
-isystem sdk/src/rp2_common/pico_aon_timer/include/ \
124138
-isystem sdk/src/rp2_common/pico_atomic/include/ \
125139
-isystem sdk/src/rp2_common/pico_bootrom/include/ \
126140
-isystem sdk/src/rp2_common/pico_double/include/ \
141+
-isystem sdk/src/rp2_common/pico_flash/include/ \
127142
-isystem sdk/src/rp2_common/pico_mem_ops/include/ \
128143
-isystem sdk/src/rp2_common/pico_multicore/include/ \
129144
-isystem sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include/ \
@@ -483,6 +498,7 @@ SRC_SDK := \
483498
src/rp2_common/hardware_uart/uart.c \
484499
src/rp2_common/hardware_vreg/vreg.c \
485500
src/rp2_common/hardware_watchdog/watchdog.c \
501+
src/rp2_common/hardware_xip_cache/xip_cache.c \
486502
src/rp2_common/hardware_xosc/xosc.c \
487503
src/rp2_common/pico_aon_timer/aon_timer.c \
488504
src/rp2_common/pico_atomic/atomic.c \

‎ports/raspberrypi/boards/cytron_edu_pico_w/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
2020

2121
CIRCUITPY_PICODVI = 1
2222

23-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
23+
CFLAGS += \
24+
-DCYW43_PIN_WL_DYNAMIC=0 \
25+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
26+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
27+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
30+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
31+
-DCYW43_WL_GPIO_COUNT=3 \
32+
-DCYW43_WL_GPIO_LED_PIN=0
33+
2434
# Must be accompanied by a linker script change
2535
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2636

‎ports/raspberrypi/boards/pajenicko_picopad/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ CIRCUITPY_PICODVI = 1
2828
# Pimoroni PicoSystem peripherals are compatible, we can use of existing ugame.py
2929
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/picosystem
3030

31-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
31+
CFLAGS += \
32+
-DCYW43_PIN_WL_DYNAMIC=0 \
33+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
34+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
35+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
36+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
37+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
38+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
39+
-DCYW43_WL_GPIO_COUNT=3 \
40+
-DCYW43_WL_GPIO_LED_PIN=0
41+
3242
# Must be accompanied by a linker script change
3343
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'

‎ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,17 @@ CIRCUITPY_WIFI = 1
2222
CIRCUITPY_PICODVI = 0
2323
CIRCUITPY_USB_HOST = 0
2424

25-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
25+
CFLAGS += \
26+
-DCYW43_PIN_WL_DYNAMIC=0 \
27+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
28+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
29+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
30+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
31+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
32+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
33+
-DCYW43_WL_GPIO_COUNT=3 \
34+
-DCYW43_WL_GPIO_LED_PIN=0
35+
2636
# Must be accompanied by a linker script change
2737
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2838

‎ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
2020
CIRCUITPY_PICODVI = 0
2121
CIRCUITPY_USB_HOST = 0
2222

23-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
23+
CFLAGS += \
24+
-DCYW43_PIN_WL_DYNAMIC=0 \
25+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
26+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
27+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
30+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
31+
-DCYW43_WL_GPIO_COUNT=3 \
32+
-DCYW43_WL_GPIO_LED_PIN=0
33+
2434
# Must be accompanied by a linker script change
2535
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2636

‎ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
2020
CIRCUITPY_PICODVI = 0
2121
CIRCUITPY_USB_HOST = 0
2222

23-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
23+
CFLAGS += \
24+
-DCYW43_PIN_WL_DYNAMIC=0 \
25+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
26+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
27+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
30+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
31+
-DCYW43_WL_GPIO_COUNT=3 \
32+
-DCYW43_WL_GPIO_LED_PIN=0
33+
2434
# Must be accompanied by a linker script change
2535
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2636

‎ports/raspberrypi/boards/pimoroni_pico_dv_base_w/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
2020

2121
CIRCUITPY_PICODVI = 1
2222

23-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
23+
CFLAGS += \
24+
-DCYW43_PIN_WL_DYNAMIC=0 \
25+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
26+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
27+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
30+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
31+
-DCYW43_WL_GPIO_COUNT=3 \
32+
-DCYW43_WL_GPIO_LED_PIN=0
33+
2434
# Must be accompanied by a linker script change
2535
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2636

‎ports/raspberrypi/boards/pimoroni_pico_plus2w/mpconfigboard.mk‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,17 @@ CIRCUITPY_WIFI = 1
2121

2222
# PIO clock divider set to 2 (default), consider changing if TM2 gSPI
2323
# becomes unreliable.
24-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 \
25-
-DCYW43_PIN_WL_REG_ON=23 \
26-
-DCYW43_WL_GPIO_COUNT=3 \
27-
-DCYW43_WL_GPIO_LED_PIN=0 \
28-
-DCYW43_PIO_CLOCK_DIV_INT=2 \
29-
-DCYW43_PIO_CLOCK_DIV_FRAC=0
24+
CFLAGS += \
25+
-DCYW43_PIN_WL_DYNAMIC=0 \
26+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
27+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
28+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
30+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
31+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
32+
-DCYW43_WL_GPIO_COUNT=3 \
33+
-DCYW43_WL_GPIO_LED_PIN=0 \
34+
-DCYW43_PIO_CLOCK_DIV_INT=2 \
35+
-DCYW43_PIO_CLOCK_DIV_FRAC=0
3036
# Must be accompanied by a linker script change
3137
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'

‎ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ CIRCUITPY_WIFI = 1
2020
CIRCUITPY_PICODVI = 0
2121
CIRCUITPY_USB_HOST = 0
2222

23-
CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0
23+
CFLAGS += \
24+
-DCYW43_PIN_WL_DYNAMIC=0 \
25+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
26+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
27+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
29+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
30+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
31+
-DCYW43_WL_GPIO_COUNT=3 \
32+
-DCYW43_WL_GPIO_LED_PIN=0
33+
2434
# Must be accompanied by a linker script change
2535
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'
2636

‎ports/raspberrypi/boards/raspberry_pi_pico2_w/mpconfigboard.mk‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ CIRCUITPY_MDNS = 1
1919
CIRCUITPY_SOCKETPOOL = 1
2020
CIRCUITPY_WIFI = 1
2121

22-
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
22+
CFLAGS += \
23+
-DCYW43_PIN_WL_DYNAMIC=0 \
24+
-DCYW43_DEFAULT_PIN_WL_HOST_WAKE=24 \
25+
-DCYW43_DEFAULT_PIN_WL_REG_ON=23 \
26+
-DCYW43_DEFAULT_PIN_WL_CLOCK=29 \
27+
-DCYW43_DEFAULT_PIN_WL_DATA_IN=24 \
28+
-DCYW43_DEFAULT_PIN_WL_DATA_OUT=24 \
29+
-DCYW43_DEFAULT_PIN_WL_CS=25 \
30+
-DCYW43_WL_GPIO_COUNT=3 \
31+
-DCYW43_WL_GPIO_LED_PIN=0 \
32+
-DCYW43_PIO_CLOCK_DIV_INT=3
33+
2334
# Must be accompanied by a linker script change
2435
CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)'

0 commit comments

Comments
 (0)