esp32/mpconfigport.h: Use the "extra" feature level.

This commit is a no-op change to simplify existing config.

Signed-off-by: Damien George <damien@micropython.org>

1 files changed, 8 insertions, 88 deletions

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index c457a5743..2ef90dea5 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -10,6 +10,10 @@
 #include "freertos/FreeRTOS.h"
 #include "driver/i2s.h"
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL            (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#endif
+
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
 #define MICROPY_NLR_SETJMP                  (1)
@@ -27,107 +31,36 @@
 #endif
 
 // compiler configuration
-#define MICROPY_COMP_MODULE_CONST           (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN    (1)
+#define MICROPY_COMP_RETURN_IF_EXPR         (0)
 
 // optimisations
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
-#define MICROPY_OPT_MPZ_BITWISE             (1)
+#define MICROPY_OPT_MATH_FACTORIAL          (0)
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
-#define MICROPY_ENABLE_FINALISER            (1)
-#define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
-#define MICROPY_KBD_EXCEPTION               (1)
-#define MICROPY_HELPER_REPL                 (1)
-#define MICROPY_REPL_EMACS_KEYS             (1)
-#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)
 #define MICROPY_WARNINGS                    (1)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_CPYTHON_COMPAT              (1)
-#define MICROPY_STREAMS_NON_BLOCK           (1)
 #define MICROPY_STREAMS_POSIX_API           (1)
-#define MICROPY_MODULE_BUILTIN_INIT         (1)
-#define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_MODULE_FROZEN_STR           (0)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
-#define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
 #define MICROPY_USE_INTERNAL_ERRNO          (0) // errno.h from xtensa-esp32-elf/sys-include/sys
 #define MICROPY_USE_INTERNAL_PRINTF         (0) // ESP32 SDK requires its own printf
-#define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
 
 // control over Python builtins
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_DESCRIPTORS              (1)
-#define MICROPY_PY_DELATTR_SETATTR          (1)
-#define MICROPY_PY_FSTRINGS                 (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
-#define MICROPY_PY_BUILTINS_BYTEARRAY       (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SET             (1)
-#define MICROPY_PY_BUILTINS_SLICE           (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
-#define MICROPY_PY_BUILTINS_FROZENSET       (1)
-#define MICROPY_PY_BUILTINS_PROPERTY        (1)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS     (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-#define MICROPY_PY_BUILTINS_COMPILE         (1)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (1)
-#define MICROPY_PY_BUILTINS_EXECFILE        (1)
-#define MICROPY_PY_BUILTINS_FILTER          (1)
-#define MICROPY_PY_BUILTINS_REVERSED        (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
-#define MICROPY_PY_BUILTINS_INPUT           (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (1)
-#define MICROPY_PY_BUILTINS_POW3            (1)
-#define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       esp32_help_text
-#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
-#define MICROPY_PY___FILE__                 (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
-#define MICROPY_PY_ARRAY                    (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_ATTRTUPLE                (1)
-#define MICROPY_PY_COLLECTIONS              (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
-#define MICROPY_PY_MATH                     (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
-#define MICROPY_PY_MATH_ISCLOSE             (1)
-#define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_GC                       (1)
-#define MICROPY_PY_IO                       (1)
-#define MICROPY_PY_IO_IOBASE                (1)
-#define MICROPY_PY_IO_FILEIO                (1)
-#define MICROPY_PY_IO_BYTESIO               (1)
+#define MICROPY_PY_MATH_CONSTANTS           (0)
+#define MICROPY_PY_MATH_FACTORIAL           (0)
 #define MICROPY_PY_IO_BUFFEREDWRITER        (1)
-#define MICROPY_PY_STRUCT                   (1)
-#define MICROPY_PY_SYS                      (1)
-#define MICROPY_PY_SYS_MAXSIZE              (1)
-#define MICROPY_PY_SYS_MODULES              (1)
-#define MICROPY_PY_SYS_EXIT                 (1)
-#define MICROPY_PY_SYS_STDFILES             (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
-#define MICROPY_PY_UERRNO                   (1)
-#define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_THREAD                   (1)
 #define MICROPY_PY_THREAD_GIL               (1)
@@ -140,22 +73,10 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_UASYNCIO                 (1)
-#define MICROPY_PY_UCTYPES                  (1)
-#define MICROPY_PY_UZLIB                    (1)
-#define MICROPY_PY_UJSON                    (1)
-#define MICROPY_PY_URE                      (1)
-#define MICROPY_PY_URE_SUB                  (1)
-#define MICROPY_PY_UHEAPQ                   (1)
 #define MICROPY_PY_UTIMEQ                   (1)
-#define MICROPY_PY_UHASHLIB                 (1)
 #define MICROPY_PY_UHASHLIB_SHA1            (1)
 #define MICROPY_PY_UHASHLIB_SHA256          (1)
 #define MICROPY_PY_UCRYPTOLIB               (1)
-#define MICROPY_PY_UBINASCII                (1)
-#define MICROPY_PY_UBINASCII_CRC32          (1)
-#define MICROPY_PY_URANDOM                  (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
@@ -192,7 +113,6 @@
 #define MICROPY_PY_USSL_FINALISER           (1)
 #define MICROPY_PY_UWEBSOCKET               (1)
 #define MICROPY_PY_WEBREPL                  (1)
-#define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_BTREE                    (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)