CIRCUITPY_FULL_BUILD now controls a few more features

dhalbert · Neradoc · commit 42a9e45b49ba · 2025-03-22T14:23:13.000+01:00
diff --git a/ports/analog/mpconfigport.h b/ports/analog/mpconfigport.h
@@ -9,9 +9,6 @@
 
 #include <stdint.h>
 
-#define MICROPY_PY_FUNCTION_ATTRS                (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
-
 // 24KiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE            0x6000
 
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
@@ -68,8 +68,7 @@
 #define MICROPY_PY_SYS_PLATFORM                     "MicroChip SAME54"
 #endif
 #define SPI_FLASH_MAX_BAUDRATE 24000000
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (1)
-#define MICROPY_PY_FUNCTION_ATTRS                   (1)
+
 //      MICROPY_PY_ERRNO_LIST - Use the default
 
 #endif // SAM_D5X_E5X
diff --git a/ports/broadcom/mpconfigport.h b/ports/broadcom/mpconfigport.h
@@ -13,9 +13,7 @@
 
 #define CIRCUITPY_MCU_FAMILY                        broadcom
 #define MICROPY_PY_SYS_PLATFORM                     "BROADCOM"
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (1)
-#define MICROPY_PY_FUNCTION_ATTRS                   (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS          (1)
+
 #if BCM_VERSION == 2837 || BCM_VERSION == 2711
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_A)
 #elif BCM_VERSION == 2835
diff --git a/ports/cxd56/boards/spresense/mpconfigboard.h b/ports/cxd56/boards/spresense/mpconfigboard.h
@@ -18,5 +18,3 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_UART2_RXD)
 #define DEFAULT_UART_BUS_TX (&pin_UART2_TXD)
-
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS          (1)
diff --git a/ports/cxd56/mpconfigport.h b/ports/cxd56/mpconfigport.h
@@ -8,9 +8,6 @@
 
 #define MICROPY_PY_SYS_PLATFORM                 "CXD56"
 
-#define MICROPY_PY_FUNCTION_ATTRS                (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
-
 // 64kiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE            (0x10000)
 
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
@@ -17,9 +17,6 @@
 
 #define CIRCUITPY_DIGITALIO_HAVE_INPUT_ONLY (1)
 
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-
 #include "py/circuitpy_mpconfig.h"
 
 #define MICROPY_NLR_SETJMP                  (1)
diff --git a/ports/litex/mpconfigport.h b/ports/litex/mpconfigport.h
@@ -9,8 +9,6 @@
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE         (0)
 #define MICROPY_NLR_THUMB                   (0)
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
 
 #include "py/circuitpy_mpconfig.h"
 
diff --git a/ports/mimxrt10xx/mpconfigport.h b/ports/mimxrt10xx/mpconfigport.h
@@ -17,10 +17,6 @@ extern uint8_t _ld_filesystem_end;
 extern uint8_t _ld_default_stack_size;
 
 #define CIRCUITPY_DEFAULT_STACK_SIZE                ((uint32_t)&_ld_default_stack_size)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (0)
-#define MICROPY_PY_FUNCTION_ATTRS                   (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS          (1)
-
 
 #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR ((uint32_t)&_ld_filesystem_start)
 #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE ((uint32_t)(&_ld_filesystem_end - &_ld_filesystem_start))
diff --git a/ports/nordic/mpconfigport.h b/ports/nordic/mpconfigport.h
@@ -13,8 +13,6 @@
 #include "nrf_sdm.h"  // for SD_FLASH_SIZE
 #include "peripherals/nrf/nvm.h" // for FLASH_PAGE_SIZE
 
-#define MICROPY_PY_FUNCTION_ATTRS                (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
 #define MICROPY_PY_SYS_STDIO_BUFFER              (1)
 
 // 24kiB stack
diff --git a/ports/raspberrypi/mpconfigport.h b/ports/raspberrypi/mpconfigport.h
@@ -16,9 +16,6 @@
 #define MICROPY_PY_SYS_PLATFORM             "RP2350"
 #endif
 
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-
 // Setting a non-default value also requires a non-default link.ld
 #ifndef CIRCUITPY_FIRMWARE_SIZE
 #define CIRCUITPY_FIRMWARE_SIZE (1020 * 1024)
diff --git a/ports/renode/mpconfigport.h b/ports/renode/mpconfigport.h
@@ -8,9 +8,6 @@
 
 #define MICROPY_PY_SYS_PLATFORM             "Renode"
 
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-
 #define MICROPY_USE_INTERNAL_PRINTF         (1)
 
 // This also includes mpconfigboard.h.
diff --git a/ports/silabs/mpconfigport.h b/ports/silabs/mpconfigport.h
@@ -29,9 +29,6 @@
 
 #include <stdint.h>
 
-#define MICROPY_PY_FUNCTION_ATTRS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
-
 // 24kiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE 0x6000
 
diff --git a/ports/stm/mpconfigport.h b/ports/stm/mpconfigport.h
@@ -9,9 +9,6 @@
 
 #include <stdint.h>
 
-#define MICROPY_PY_FUNCTION_ATTRS                (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
-
 extern uint8_t _ld_default_stack_size;
 
 // 24kiB stack
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -93,6 +93,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_OPT_COMPUTED_GOTO_SAVE_SPACE (CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE)
 #define MICROPY_OPT_LOAD_ATTR_FAST_PATH  (CIRCUITPY_OPT_LOAD_ATTR_FAST_PATH)
 #define MICROPY_OPT_MAP_LOOKUP_CACHE  (CIRCUITPY_OPT_MAP_LOOKUP_CACHE)
+#define MICROPY_OPT_MPZ_BITWISE          (0)
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (CIRCUITPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE)
 #define MICROPY_PERSISTENT_CODE_LOAD     (1)
 
@@ -224,31 +225,52 @@ typedef long mp_off_t;
 
 // Turning off FULL_BUILD removes some functionality to reduce flash size on tiny SAMD21s
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (CIRCUITPY_FULL_BUILD)
+
 #ifndef MICROPY_CPYTHON_COMPAT
 #define MICROPY_CPYTHON_COMPAT                (CIRCUITPY_FULL_BUILD)
 #endif
+
 #ifndef MICROPY_CPYTHON_EXCEPTION_CHAIN
 #define MICROPY_CPYTHON_EXCEPTION_CHAIN       (CIRCUITPY_FULL_BUILD)
 #endif
+
 #define MICROPY_PY_BUILTINS_POW3              (CIRCUITPY_BUILTINS_POW3)
 #define MICROPY_PY_FSTRINGS                   (1)
 #define MICROPY_MODULE_WEAK_LINKS             (0)
 #define MICROPY_PY_ALL_SPECIAL_METHODS        (CIRCUITPY_FULL_BUILD)
+
 #ifndef MICROPY_PY_BUILTINS_COMPLEX
 #define MICROPY_PY_BUILTINS_COMPLEX           (CIRCUITPY_FULL_BUILD)
 #endif
+
 #define MICROPY_PY_BUILTINS_FROZENSET         (CIRCUITPY_FULL_BUILD)
+
+#ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED    (CIRCUITPY_FULL_BUILD)
+#endif
+
 #define MICROPY_PY_BUILTINS_STR_CENTER        (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_BUILTINS_STR_PARTITION     (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES    (CIRCUITPY_FULL_BUILD)
+
 #ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT    (CIRCUITPY_FULL_BUILD)
 #endif
+
 #ifndef MICROPY_PY_COLLECTIONS_DEQUE
 #define MICROPY_PY_COLLECTIONS_DEQUE          (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_COLLECTIONS_DEQUE_ITER     (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR   (CIRCUITPY_FULL_BUILD)
 #endif
+
+#ifndef MICROPY_PY_FUNCTION_ATTRS
+#define MICROPY_PY_FUNCTION_ATTRS            (CIRCUITPY_FULL_BUILD)
+#endif
+
+#ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS   (CIRCUITPY_FULL_BUILD)
+#endif
+
 #define MICROPY_PY_RE_MATCH_GROUPS           (CIRCUITPY_RE)
 #define MICROPY_PY_RE_MATCH_SPAN_START_END   (CIRCUITPY_RE)
 #define MICROPY_PY_RE_SUB                    (CIRCUITPY_RE)
