From 6e278900bd22cce097cbec88d3f6d586a001610e Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 10 Oct 2023 14:47:03 -0700 Subject: [PATCH] Only include mpconfigport.h once --- py/mpconfig.h | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/py/mpconfig.h b/py/mpconfig.h index ca205a6e8c..d7fd785fdc 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -53,21 +53,6 @@ // You can override any of the options below using mpconfigport.h file // located in a directory of your port. -// mpconfigport.h is a file containing configuration settings for a -// particular port. mpconfigport.h is actually a default name for -// such config, and it can be overridden using MP_CONFIGFILE preprocessor -// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE=""' -// argument to make when using standard MicroPython makefiles). -// This is useful to have more than one config per port, for example, -// release vs debug configs, etc. Note that if you switch from one config -// to another, you must rebuild from scratch using "-B" switch to make. - -#ifdef MP_CONFIGFILE -#include MP_CONFIGFILE -#else -#include -#endif - // Is this a CircuitPython build? #ifndef CIRCUITPY #define CIRCUITPY 0 @@ -86,6 +71,15 @@ // Enable everything (e.g. coverage) #define MICROPY_CONFIG_ROM_LEVEL_EVERYTHING (50) +// mpconfigport.h is a file containing configuration settings for a +// particular port. mpconfigport.h is actually a default name for +// such config, and it can be overridden using MP_CONFIGFILE preprocessor +// define (you can do that by passing CFLAGS_EXTRA='-DMP_CONFIGFILE=""' +// argument to make when using standard MicroPython makefiles). +// This is useful to have more than one config per port, for example, +// release vs debug configs, etc. Note that if you switch from one config +// to another, you must rebuild from scratch using "-B" switch to make. + #ifdef MP_CONFIGFILE #include MP_CONFIGFILE #else