From 3ae6ed78afedb7f4a8dadca35628e1626c8ff99a Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Mon, 3 Jun 2024 23:01:18 +0100 Subject: [PATCH] all: use py/mpconfig.h in lieu of mpconfigport.h. Use py/mpconfig.h to ensure that the MP_CONFIGFILE define is respected. --- ports/atmel-samd/common-hal/audiobusio/I2SOut.c | 2 +- ports/atmel-samd/common-hal/busio/UART.c | 2 +- ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c | 2 +- ports/atmel-samd/common-hal/ps2io/Ps2.c | 2 +- ports/atmel-samd/common-hal/pulseio/PulseIn.c | 2 +- ports/atmel-samd/common-hal/pulseio/PulseOut.c | 2 +- ports/atmel-samd/supervisor/internal_flash.h | 2 +- ports/atmel-samd/tools/mkcandata.py | 2 +- ports/atmel-samd/tools/mksdiodata.py | 2 +- ports/broadcom/supervisor/internal_flash.h | 2 +- ports/espressif/common-hal/audiobusio/I2SOut.c | 2 +- ports/espressif/common-hal/busio/UART.c | 2 +- ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c | 2 +- ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c | 2 +- ports/mimxrt10xx/common-hal/busio/UART.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1015/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1021/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1042/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1052/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c | 2 +- ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1176/clocks.c | 2 +- ports/nordic/peripherals/nrf/clocks.c | 2 +- ports/raspberrypi/common-hal/audiobusio/I2SOut.c | 2 +- ports/raspberrypi/common-hal/pulseio/PulseOut.c | 2 +- ports/raspberrypi/supervisor/internal_flash.h | 2 +- ports/silabs/common-hal/busio/UART.c | 2 +- ports/stm/common-hal/busio/UART.c | 2 +- shared/timeutils/timeutils.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c index b8c8e93e88d8..9b319dbc86bf 100644 --- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c +++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c @@ -7,7 +7,7 @@ #include #include -#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 index 31b644bea9af..fb149bab2879 100644 --- 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 index 405e043bf691..5c850d3ccf48 100644 --- 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 index 006833c3d636..2cc98df2d60b 100644 --- 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 index 705f8ceeb8be..189b6b222aeb 100644 --- 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 index a345405533a3..54b39a60d96e 100644 --- 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 index 6fafa4bc8d4f..3be011517728 100644 --- a/ports/atmel-samd/supervisor/internal_flash.h +++ b/ports/atmel-samd/supervisor/internal_flash.h @@ -7,7 +7,7 @@ #include -#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 index d505c81bdc49..de0efbf67353 100755 --- 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 index bfdcd696c26a..d3b092deb5b2 100755 --- 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 index 94b1f0bc973f..f10316d34adc 100644 --- a/ports/broadcom/supervisor/internal_flash.h +++ b/ports/broadcom/supervisor/internal_flash.h @@ -7,4 +7,4 @@ #include -#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 index adfc081389a1..94fd0d2730bf 100644 --- a/ports/espressif/common-hal/audiobusio/I2SOut.c +++ b/ports/espressif/common-hal/audiobusio/I2SOut.c @@ -7,7 +7,7 @@ #include #include -#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 index 3967af44dbd1..5b1c1d349acb 100644 --- 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 index c785f4e090ef..be0d64341121 100644 --- a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c +++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c @@ -7,7 +7,7 @@ #include #include -#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 index 430d1779817c..75e52147d570 100644 --- a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c @@ -7,7 +7,7 @@ #include #include -#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 index d372865e8a1c..d94f1e5ddc79 100644 --- 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 index 2b1e2736b206..10f44de61d8a 100644 --- 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 index 67e530291538..48cde2a4b706 100644 --- 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 index 5f46c37d8b0e..7b0ced17814c 100644 --- 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 index dc9fc8416a76..19f73120534c 100644 --- 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 index cce3fec885d9..d6c91ebf0d28 100644 --- 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 index 9385c9cc4c71..6d4b53da9661 100644 --- 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 index 66f0c769a37d..c6c44feb2f31 100644 --- 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 index 0eb4c4404eee..8f1242ed5f39 100644 --- 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 index f3c23400db28..0d1ee5616e77 100644 --- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c +++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c @@ -7,7 +7,7 @@ #include #include -#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 index 89a09600396d..bd8ef090575a 100644 --- 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 -#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 index 01acbf02b4de..da3028ae687d 100644 --- a/ports/raspberrypi/supervisor/internal_flash.h +++ b/ports/raspberrypi/supervisor/internal_flash.h @@ -7,7 +7,7 @@ #include -#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 index 8a598cfb9030..5f3af23c48de 100644 --- 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 index e44fbc66a6c8..1c7a00644a18 100644 --- 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 index 13ec3a01f2b2..e882e75de0a7 100644 --- 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))