Skip to content

Commit 2896394

Browse files
dhalbertdhalbert
authored
Merge pull request #10188 from jepler/rp2350-headers
Depend on header inclusion via -isystem
2 parents 3da012d + 420491f commit 2896394

File tree

57 files changed

+125
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+125
-136
lines changed

‎ports/raspberrypi/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ HAL_DIR=hal/$(MCU_SERIES)
1212

1313
ifeq ($(CIRCUITPY_CYW43),1)
1414
INC_CYW43 := \
15+
-isystem lib/cyw43-driver \
1516
-isystem lib/cyw43-driver/firmware \
1617
-isystem lib/cyw43-driver/src \
1718
-isystem lib/lwip/src/include \
@@ -92,8 +93,6 @@ INC += \
9293
-I../shared/timeutils \
9394
-Iboards/$(BOARD) \
9495
-Iboards/ \
95-
-isystem ./../../lib/cmsis/inc \
96-
-isystem sdk/ \
9796
-isystem sdk/src/common/boot_picobin_headers/include/ \
9897
-isystem sdk/src/common/boot_picoboot_headers/include/ \
9998
-isystem sdk/src/common/hardware_claim/include/ \
@@ -107,6 +106,8 @@ INC += \
107106
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/hardware_structs/include/ \
108107
-isystem sdk/src/$(CHIP_VARIANT_LOWER)/pico_platform/include/ \
109108
-isystem sdk/src/rp2_common/boot_bootrom_headers/include/ \
109+
-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Core/Include/ \
110+
-isystem sdk/src/rp2_common/cmsis/stub/CMSIS/Device/${CHIP_VARIANT}/Include \
110111
-isystem sdk/src/rp2_common/cmsis/ \
111112
-isystem sdk/src/rp2_common/hardware_adc/include/ \
112113
-isystem sdk/src/rp2_common/hardware_base/include/ \
@@ -153,7 +154,7 @@ INC += \
153154
-isystem sdk/src/rp2_common/pico_platform_panic/include/ \
154155
-isystem sdk/src/rp2_common/pico_time_adapter/include/ \
155156
-isystem sdk/src/rp2_common/pico_unique_id/include/ \
156-
$(INC_CYW43) \
157+
$(INC_CYW43) \
157158
-Isdk_config \
158159
-I../../lib/tinyusb/src \
159160
-I../../supervisor/shared/usb \

‎ports/raspberrypi/audio_dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "py/mpstate.h"
1616
#include "py/runtime.h"
1717

18-
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
18+
#include "hardware/irq.h"
1919
#include "hardware/regs/intctrl.h" // For isr_ macro.
2020

2121

‎ports/raspberrypi/audio_dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "py/obj.h"
1010
#include "supervisor/background_callback.h"
1111

12-
#include "src/rp2_common/hardware_dma/include/hardware/dma.h"
12+
#include "hardware/dma.h"
1313

1414
typedef enum {
1515
AUDIO_DMA_OK,

‎ports/raspberrypi/bindings/cyw43/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "shared-bindings/microcontroller/Pin.h"
1313
#include "bindings/cyw43/__init__.h"
1414

15-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
15+
#include "hardware/gpio.h"
1616

1717
#include "lib/cyw43-driver/src/cyw43.h"
1818

‎ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "shared-module/displayio/mipi_constants.h"
1111
#include "shared-bindings/busio/SPI.h"
1212
#include "shared-bindings/microcontroller/Pin.h"
13-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
13+
#include "hardware/gpio.h"
1414
#include "supervisor/board.h"
1515
#include "supervisor/shared/board.h"
1616

‎ports/raspberrypi/boards/adafruit_qt2040_trinkey/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#include "supervisor/board.h"
88

99
#include "shared-bindings/microcontroller/Pin.h"
10-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
10+
#include "hardware/gpio.h"
1111

1212
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/raspberrypi/boards/boardsource_blok/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void board_init(void) {

‎ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "shared-module/displayio/__init__.h"
2727
#include "supervisor/shared/board.h"
2828

29-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
29+
#include "hardware/gpio.h"
3030

31-
#include "src/rp2_common/hardware_adc/include/hardware/adc.h"
31+
#include "hardware/adc.h"
3232
#define ADC_FIRST_PIN_NUMBER 26
3333
#define ADC_PIN_COUNT 4
3434
extern void common_hal_mcu_delay_us(uint32_t);

‎ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "shared-bindings/board/__init__.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111
#include "supervisor/board.h"
1212

‎ports/raspberrypi/boards/jpconstantineau_pykey18/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "supervisor/board.h"
88
#include "shared-bindings/microcontroller/Pin.h"
9-
#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
9+
#include "hardware/gpio.h"
1010
#include "supervisor/shared/board.h"
1111

1212
void reset_board(void) {

0 commit comments

Comments
 (0)