all: use py/mpconfig.h in lieu of mpconfigport.h.

Use py/mpconfig.h to ensure that the MP_CONFIGFILE define is respected.
Gadgetoid · Jun 3, 2024 · 3ae6ed7 · 3ae6ed7
1 parent b1e4bc3
commit 3ae6ed7
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 // Some boards don't implement I2SOut, so suppress any routines from here.
 #if CIRCUITPY_AUDIOBUSIO_I2SOUT

diff --git a/ports/atmel-samd/common-hal/busio/UART.c b/ports/atmel-samd/common-hal/busio/UART.c
@@ -9,7 +9,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/busio/UART.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"
 #include "py/mperrno.h"

diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
@@ -11,7 +11,7 @@
 #include "hal/include/hal_gpio.h"
 #include "atmel_start_pins.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "py/runtime.h"
 #include "timer_handler.h"
 #include "background.h"

diff --git a/ports/atmel-samd/common-hal/ps2io/Ps2.c b/ports/atmel-samd/common-hal/ps2io/Ps2.c
@@ -15,7 +15,7 @@
 
 #include "background.h"
 #include "eic_handler.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "samd/external_interrupts.h"

diff --git a/ports/atmel-samd/common-hal/pulseio/PulseIn.c b/ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -13,7 +13,7 @@
 
 #include "background.h"
 #include "eic_handler.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "timer_handler.h"
 #include "py/gc.h"
 #include "py/runtime.h"

diff --git a/ports/atmel-samd/common-hal/pulseio/PulseOut.c b/ports/atmel-samd/common-hal/pulseio/PulseOut.c
@@ -10,7 +10,7 @@
 
 #include "hal/include/hal_gpio.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "samd/pins.h"
 #include "samd/timers.h"
 #include "py/gc.h"

diff --git a/ports/atmel-samd/supervisor/internal_flash.h b/ports/atmel-samd/supervisor/internal_flash.h
@@ -7,7 +7,7 @@
 
 #include <stdbool.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "sam.h"
 

diff --git a/ports/atmel-samd/tools/mkcandata.py b/ports/atmel-samd/tools/mkcandata.py
@@ -26,7 +26,7 @@ def defines(name, suffix):
 #include "py/obj.h"
 #include "sam.h"
 #include "samd/pins.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "atmel_start_pins.h"
 #include "hal/include/hal_gpio.h"
 #include "common-hal/microcontroller/Pin.h"

diff --git a/ports/atmel-samd/tools/mksdiodata.py b/ports/atmel-samd/tools/mksdiodata.py
@@ -25,7 +25,7 @@ def defines(name, function):
 #include "py/obj.h"
 #include "sam.h"
 #include "samd/pins.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "atmel_start_pins.h"
 #include "hal/include/hal_gpio.h"
 #include "common-hal/microcontroller/Pin.h"

diff --git a/ports/broadcom/supervisor/internal_flash.h b/ports/broadcom/supervisor/internal_flash.h
@@ -7,4 +7,4 @@
 
 #include <stdbool.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
diff --git a/ports/espressif/common-hal/audiobusio/I2SOut.c b/ports/espressif/common-hal/audiobusio/I2SOut.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "bindings/espidf/__init__.h"
 

diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
@@ -10,7 +10,7 @@
 
 #include "components/driver/uart/include/driver/uart.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"

diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 // Some boards don't implement I2SOut, so suppress any routines from here.
 #if CIRCUITPY_AUDIOBUSIO_I2SOUT

diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "py/gc.h"
 #include "py/mperrno.h"

diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c
@@ -9,7 +9,7 @@
 #include "shared-bindings/microcontroller/__init__.h"
 #include "shared-bindings/busio/UART.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "shared/runtime/interrupt_char.h"
 #include "supervisor/shared/tick.h"
 #include "py/gc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c b/ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "fsl_clock.h"
 #include "fsl_iomuxc.h"

diff --git a/ports/nordic/peripherals/nrf/clocks.c b/ports/nordic/peripherals/nrf/clocks.c
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "nrfx.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 void nrf_peripherals_clocks_init(void) {
 

diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 #include "py/gc.h"
 #include "py/mperrno.h"

diff --git a/ports/raspberrypi/common-hal/pulseio/PulseOut.c b/ports/raspberrypi/common-hal/pulseio/PulseOut.c
@@ -7,7 +7,7 @@
 #include "common-hal/pulseio/PulseOut.h"
 
 #include <stdint.h>
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "py/runtime.h"
 #include "shared-bindings/pulseio/PulseOut.h"
 #include "shared-bindings/pwmio/PWMOut.h"

diff --git a/ports/raspberrypi/supervisor/internal_flash.h b/ports/raspberrypi/supervisor/internal_flash.h
@@ -7,7 +7,7 @@
 
 #include <stdbool.h>
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 
 // #define INTERNAL_FLASH_PART1_NUM_BLOCKS (CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
 

diff --git a/ports/silabs/common-hal/busio/UART.c b/ports/silabs/common-hal/busio/UART.c
@@ -28,7 +28,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/busio/UART.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"

diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c
@@ -8,7 +8,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/busio/UART.h"
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/interrupt_char.h"
 #include "py/gc.h"

diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 #define MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 
-#include "mpconfigport.h" // CIRCUITPY-CHANGE for MICROPY_EPOCH_IS_1970
+#include "py/mpconfig.h" // CIRCUITPY-CHANGE for MICROPY_EPOCH_IS_1970
 
 // The number of seconds between 1970/1/1 and 2000/1/1 is calculated using:
 // time.mktime((2000,1,1,0,0,0,0,0,0)) - time.mktime((1970,1,1,0,0,0,0,0,0))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		#include <stdbool.h>

		#include "mpconfigport.h"
		#include "py/mpconfig.h"