adafruit · dhalbert · Mar 26, 2025 · Mar 26, 2025
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
@@ -12,6 +12,7 @@ HAL_DIR=hal/$(MCU_SERIES)
 
 ifeq ($(CIRCUITPY_CYW43),1)
 INC_CYW43 := \
+	-isystem lib/cyw43-driver \
 	-isystem lib/cyw43-driver/firmware \
 	-isystem lib/cyw43-driver/src \
 	-isystem lib/lwip/src/include \
@@ -92,8 +93,6 @@ INC += \
 	-I../shared/timeutils \
 	-Iboards/$(BOARD) \
 	-Iboards/ \
-	-isystem ./../../lib/cmsis/inc \
-	-isystem sdk/ \
 	-isystem sdk/src/common/boot_picobin_headers/include/ \
 	-isystem sdk/src/common/boot_picoboot_headers/include/ \
 	-isystem sdk/src/common/hardware_claim/include/ \
@@ -107,6 +106,8 @@ INC += \
 	-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/stub/CMSIS/Core/Include/ \
+	-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Device/${CHIP_VARIANT}/Include \
 	-isystem sdk/src/rp2_common/cmsis/ \
 	-isystem sdk/src/rp2_common/hardware_adc/include/ \
 	-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -153,7 +154,7 @@ INC += \
 	-isystem sdk/src/rp2_common/pico_platform_panic/include/ \
 	-isystem sdk/src/rp2_common/pico_time_adapter/include/ \
 	-isystem sdk/src/rp2_common/pico_unique_id/include/ \
-$(INC_CYW43) \
+	$(INC_CYW43) \
 	-Isdk_config \
 	-I../../lib/tinyusb/src \
 	-I../../supervisor/shared/usb \

diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c
@@ -15,7 +15,7 @@
 #include "py/mpstate.h"
 #include "py/runtime.h"
 
-#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
+#include "hardware/irq.h"
 #include "hardware/regs/intctrl.h" // For isr_ macro.
 
 

diff --git a/ports/raspberrypi/audio_dma.h b/ports/raspberrypi/audio_dma.h
@@ -9,7 +9,7 @@
 #include "py/obj.h"
 #include "supervisor/background_callback.h"
 
-#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
+#include "hardware/dma.h"
 
 typedef enum {
     AUDIO_DMA_OK,

diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -12,7 +12,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "bindings/cyw43/__init__.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 #include "lib/cyw43-driver/src/cyw43.h"
 

diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c
@@ -10,7 +10,7 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/board.h"
 #include "supervisor/shared/board.h"
 

diff --git a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c
@@ -7,6 +7,6 @@
 #include "supervisor/board.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/raspberrypi/boards/boardsource_blok/board.c b/ports/raspberrypi/boards/boardsource_blok/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void board_init(void) {

diff --git a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c
@@ -26,9 +26,9 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/board.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
-#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
+#include "hardware/adc.h"
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4
 extern void common_hal_mcu_delay_us(uint32_t);

diff --git a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
@@ -6,7 +6,7 @@
 
 #include "shared-bindings/board/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 #include "supervisor/board.h"
 

diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey18/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey44/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey60/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c b/ports/raspberrypi/boards/jpconstantineau_pykey87/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boards/ugame22/board.c b/ports/raspberrypi/boards/ugame22/board.c
@@ -7,7 +7,7 @@
 #include "supervisor/board.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/fourwire/FourWire.h"

diff --git a/ports/raspberrypi/boards/wk-50/board.c b/ports/raspberrypi/boards/wk-50/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
@@ -6,7 +6,7 @@
 
 #include "supervisor/board.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 #include "supervisor/shared/board.h"
 
 void reset_board(void) {

diff --git a/ports/raspberrypi/boot_stage2/RP2040.c.jinja b/ports/raspberrypi/boot_stage2/RP2040.c.jinja
@@ -1,7 +1,7 @@
-#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/ssi.h"
-#include "sdk/src/rp2040/hardware_structs/include/hardware/structs/pads_qspi.h"
-#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/addressmap.h"
-#include "sdk/src/rp2040/hardware_regs/include/hardware/regs/m0plus.h"
+#include "hardware/structs/ssi.h"
+#include "hardware/structs/pads_qspi.h"
+#include "hardware/regs/addressmap.h"
+#include "hardware/regs/m0plus.h"
 
 // "Mode bits" are 8 special bits sent immediately after
 // the address bits in a "Read Data Fast Quad I/O" command sequence.

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.c
@@ -11,9 +11,9 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
-#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
-#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
-#include "src/common/pico_stdlib_headers/include/pico/stdlib.h"
+#include "hardware/adc.h"
+#include "hardware/dma.h"
+#include "pico/stdlib.h"
 
 #define ADC_FIRST_PIN_NUMBER 26
 #define ADC_PIN_COUNT 4

diff --git a/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h b/ports/raspberrypi/common-hal/analogbufio/BufferedIn.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "common-hal/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
+#include "hardware/dma.h"
 
 #include "py/obj.h"
 

diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -10,7 +10,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 
-#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
+#include "hardware/adc.h"
 
 #define ADC_PIN_COUNT (NUM_ADC_CHANNELS - 1)
 

diff --git a/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c b/ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
@@ -20,8 +20,8 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Processor.h"
 
-#include "src/rp2040/hardware_structs/include/hardware/structs/dma.h"
-#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
+#include "hardware/structs/dma.h"
+#include "hardware/pwm.h"
 
 // The PWM clock frequency is base_clock_rate / PWM_TOP, typically 125_000_000 / PWM_TOP.
 // We pick BITS_PER_SAMPLE so we get a clock frequency that is above what would cause aliasing.

diff --git a/ports/raspberrypi/common-hal/busio/I2C.c b/ports/raspberrypi/common-hal/busio/I2C.c
@@ -13,7 +13,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/bitbangio/I2C.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 // Synopsys  DW_apb_i2c  (v2.01)  IP
 

diff --git a/ports/raspberrypi/common-hal/busio/I2C.h b/ports/raspberrypi/common-hal/busio/I2C.h
@@ -11,7 +11,7 @@
 
 #include "py/obj.h"
 
-#include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
+#include "hardware/i2c.h"
 
 typedef struct {
     mp_obj_base_t base;

diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c
@@ -14,8 +14,8 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/dma.h"
+#include "hardware/gpio.h"
 
 #define NO_INSTANCE 0xff
 

diff --git a/ports/raspberrypi/common-hal/busio/SPI.h b/ports/raspberrypi/common-hal/busio/SPI.h
@@ -10,7 +10,7 @@
 
 #include "py/obj.h"
 
-#include "src/rp2_common/hardware_spi/include/hardware/spi.h"
+#include "hardware/spi.h"
 
 typedef struct {
     mp_obj_base_t base;

diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c
@@ -14,8 +14,8 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/irq.h"
+#include "hardware/gpio.h"
 
 #define NO_PIN 0xff
 

diff --git a/ports/raspberrypi/common-hal/busio/UART.h b/ports/raspberrypi/common-hal/busio/UART.h
@@ -9,7 +9,7 @@
 #include "py/obj.h"
 #include "py/ringbuf.h"
 
-#include "src/rp2_common/hardware_uart/include/hardware/uart.h"
+#include "hardware/uart.h"
 
 typedef struct {
     mp_obj_base_t base;

diff --git a/ports/raspberrypi/common-hal/countio/Counter.c b/ports/raspberrypi/common-hal/countio/Counter.c
@@ -13,9 +13,9 @@
 #include "shared-bindings/digitalio/Pull.h"
 #include "common-hal/pwmio/PWMOut.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
-#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
-#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
+#include "hardware/gpio.h"
+#include "hardware/pwm.h"
+#include "hardware/irq.h"
 
 
 void common_hal_countio_counter_construct(countio_counter_obj_t *self,

diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -14,7 +14,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 #if CIRCUITPY_CYW43
 #include "pico/cyw43_arch.h"

diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -14,7 +14,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "py/runtime.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 static i2c_inst_t *i2c[2] = {i2c0, i2c1};
 

diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.h
@@ -8,7 +8,7 @@
 
 #include "py/obj.h"
 #include "common-hal/microcontroller/Pin.h"
-#include "src/rp2_common/hardware_i2c/include/hardware/i2c.h"
+#include "hardware/i2c.h"
 
 typedef struct {
     mp_obj_base_t base;

diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
@@ -18,8 +18,8 @@
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
-#include "src/rp2_common/hardware_pio/include/hardware/pio.h"
-#include "src/rp2_common/hardware_pio/include/hardware/pio_instructions.h"
+#include "hardware/pio.h"
+#include "hardware/pio_instructions.h"
 
 // Define this to (1), and you can scope the instruction-pointer of the state machine on D26..28 (note the weird encoding though!)
 #define DEBUG_STATE_MACHINE (0)

diff --git a/ports/raspberrypi/common-hal/max3421e/Max3421E.c b/ports/raspberrypi/common-hal/max3421e/Max3421E.c
@@ -10,7 +10,7 @@
 #include "shared-bindings/busio/SPI.h"
 #include "supervisor/usb.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 static max3421e_max3421e_obj_t *active_max = NULL;
 

diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c
@@ -9,7 +9,7 @@
 #include "common-hal/microcontroller/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
-#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "hardware/gpio.h"
 
 static uint64_t gpio_bank0_pin_claimed;
 

diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.c b/ports/raspberrypi/common-hal/microcontroller/Processor.c
@@ -15,26 +15,21 @@
 #include "shared-bindings/time/__init__.h"
 
 #include "pico/stdlib.h"
-#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
-#include "src/rp2_common/hardware_clocks/include/hardware/clocks.h"
-#include "src/rp2_common/hardware_vreg/include/hardware/vreg.h"
-#include "src/rp2_common/hardware_watchdog/include/hardware/watchdog.h"
+#include "hardware/adc.h"
+#include "hardware/clocks.h"
+#include "hardware/vreg.h"
+#include "hardware/watchdog.h"
 
 #ifdef PICO_RP2040
-#include "src/rp2040/hardware_regs/include/hardware/regs/vreg_and_chip_reset.h"
+#include "hardware/regs/vreg_and_chip_reset.h"
+#include "hardware/structs/vreg_and_chip_reset.h"
 #endif
 #ifdef PICO_RP2350
-#include "src/rp2350/hardware_regs/include/hardware/regs/powman.h"
+#include "hardware/regs/powman.h"
+#include "hardware/structs/powman.h"
 #endif
-#include "src/rp2040/hardware_regs/include/hardware/regs/watchdog.h"
-
-#ifdef PICO_RP2040
-#include "src/rp2040/hardware_structs/include/hardware/structs/vreg_and_chip_reset.h"
-#endif
-#ifdef PICO_RP2350
-#include "src/rp2350/hardware_structs/include/hardware/structs/powman.h"
-#endif
-#include "src/rp2040/hardware_structs/include/hardware/structs/watchdog.h"
+#include "hardware/regs/watchdog.h"
+#include "hardware/structs/watchdog.h"
 
 float common_hal_mcu_processor_get_temperature(void) {
     adc_init();

diff --git a/ports/raspberrypi/common-hal/microcontroller/Processor.h b/ports/raspberrypi/common-hal/microcontroller/Processor.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "src/rp2_common/pico_unique_id/include/pico/unique_id.h"
+#include "pico/unique_id.h"
 
 #define COMMON_HAL_MCU_PROCESSOR_UID_LENGTH PICO_UNIQUE_BOARD_ID_SIZE_BYTES