Skip to content

Commit c8cd5a9

Browse files
committed
esp32/mpconfigport.h: Use the "extra" feature level.
This commit is a no-op change to simplify existing config. Signed-off-by: Damien George <[email protected]>
1 parent ff9c708 commit c8cd5a9

File tree

1 file changed

+8
-88
lines changed

1 file changed

+8
-88
lines changed

ports/esp32/mpconfigport.h

Lines changed: 8 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#include "freertos/FreeRTOS.h"
1111
#include "driver/i2s.h"
1212

13+
#ifndef MICROPY_CONFIG_ROM_LEVEL
14+
#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
15+
#endif
16+
1317
// object representation and NLR handling
1418
#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
1519
#define MICROPY_NLR_SETJMP (1)
@@ -27,107 +31,36 @@
2731
#endif
2832

2933
// compiler configuration
30-
#define MICROPY_COMP_MODULE_CONST (1)
31-
#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
34+
#define MICROPY_COMP_RETURN_IF_EXPR (0)
3235

3336
// optimisations
3437
#define MICROPY_OPT_COMPUTED_GOTO (1)
35-
#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
36-
#define MICROPY_OPT_MAP_LOOKUP_CACHE (1)
37-
#define MICROPY_OPT_MPZ_BITWISE (1)
38+
#define MICROPY_OPT_MATH_FACTORIAL (0)
3839

3940
// Python internal features
4041
#define MICROPY_READER_VFS (1)
4142
#define MICROPY_ENABLE_GC (1)
42-
#define MICROPY_ENABLE_FINALISER (1)
43-
#define MICROPY_STACK_CHECK (1)
4443
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
45-
#define MICROPY_KBD_EXCEPTION (1)
46-
#define MICROPY_HELPER_REPL (1)
47-
#define MICROPY_REPL_EMACS_KEYS (1)
48-
#define MICROPY_REPL_AUTO_INDENT (1)
4944
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
50-
#define MICROPY_ENABLE_SOURCE_LINE (1)
5145
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
5246
#define MICROPY_WARNINGS (1)
5347
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
54-
#define MICROPY_CPYTHON_COMPAT (1)
55-
#define MICROPY_STREAMS_NON_BLOCK (1)
5648
#define MICROPY_STREAMS_POSIX_API (1)
57-
#define MICROPY_MODULE_BUILTIN_INIT (1)
58-
#define MICROPY_MODULE_WEAK_LINKS (1)
5949
#define MICROPY_MODULE_FROZEN_STR (0)
6050
#define MICROPY_MODULE_FROZEN_MPY (1)
6151
#define MICROPY_QSTR_EXTRA_POOL mp_qstr_frozen_const_pool
62-
#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
6352
#define MICROPY_USE_INTERNAL_ERRNO (0) // errno.h from xtensa-esp32-elf/sys-include/sys
6453
#define MICROPY_USE_INTERNAL_PRINTF (0) // ESP32 SDK requires its own printf
65-
#define MICROPY_ENABLE_SCHEDULER (1)
6654
#define MICROPY_SCHEDULER_DEPTH (8)
6755
#define MICROPY_VFS (1)
6856

6957
// control over Python builtins
70-
#define MICROPY_PY_FUNCTION_ATTRS (1)
71-
#define MICROPY_PY_DESCRIPTORS (1)
72-
#define MICROPY_PY_DELATTR_SETATTR (1)
73-
#define MICROPY_PY_FSTRINGS (1)
7458
#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
75-
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
76-
#define MICROPY_PY_BUILTINS_STR_CENTER (1)
77-
#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
78-
#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
79-
#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
80-
#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
81-
#define MICROPY_PY_BUILTINS_SET (1)
82-
#define MICROPY_PY_BUILTINS_SLICE (1)
83-
#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
84-
#define MICROPY_PY_BUILTINS_SLICE_INDICES (1)
85-
#define MICROPY_PY_BUILTINS_FROZENSET (1)
86-
#define MICROPY_PY_BUILTINS_PROPERTY (1)
87-
#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
88-
#define MICROPY_PY_BUILTINS_ROUND_INT (1)
89-
#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
9059
#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
91-
#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
92-
#define MICROPY_PY_BUILTINS_COMPILE (1)
93-
#define MICROPY_PY_BUILTINS_ENUMERATE (1)
94-
#define MICROPY_PY_BUILTINS_EXECFILE (1)
95-
#define MICROPY_PY_BUILTINS_FILTER (1)
96-
#define MICROPY_PY_BUILTINS_REVERSED (1)
97-
#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
98-
#define MICROPY_PY_BUILTINS_INPUT (1)
99-
#define MICROPY_PY_BUILTINS_MIN_MAX (1)
100-
#define MICROPY_PY_BUILTINS_POW3 (1)
101-
#define MICROPY_PY_BUILTINS_HELP (1)
10260
#define MICROPY_PY_BUILTINS_HELP_TEXT esp32_help_text
103-
#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
104-
#define MICROPY_PY___FILE__ (1)
105-
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
106-
#define MICROPY_PY_ARRAY (1)
107-
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
108-
#define MICROPY_PY_ATTRTUPLE (1)
109-
#define MICROPY_PY_COLLECTIONS (1)
110-
#define MICROPY_PY_COLLECTIONS_DEQUE (1)
111-
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
112-
#define MICROPY_PY_MATH (1)
113-
#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
114-
#define MICROPY_PY_MATH_ISCLOSE (1)
115-
#define MICROPY_PY_CMATH (1)
116-
#define MICROPY_PY_GC (1)
117-
#define MICROPY_PY_IO (1)
118-
#define MICROPY_PY_IO_IOBASE (1)
119-
#define MICROPY_PY_IO_FILEIO (1)
120-
#define MICROPY_PY_IO_BYTESIO (1)
61+
#define MICROPY_PY_MATH_CONSTANTS (0)
62+
#define MICROPY_PY_MATH_FACTORIAL (0)
12163
#define MICROPY_PY_IO_BUFFEREDWRITER (1)
122-
#define MICROPY_PY_STRUCT (1)
123-
#define MICROPY_PY_SYS (1)
124-
#define MICROPY_PY_SYS_MAXSIZE (1)
125-
#define MICROPY_PY_SYS_MODULES (1)
126-
#define MICROPY_PY_SYS_EXIT (1)
127-
#define MICROPY_PY_SYS_STDFILES (1)
128-
#define MICROPY_PY_SYS_STDIO_BUFFER (1)
129-
#define MICROPY_PY_UERRNO (1)
130-
#define MICROPY_PY_USELECT (1)
13164
#define MICROPY_PY_UTIME_MP_HAL (1)
13265
#define MICROPY_PY_THREAD (1)
13366
#define MICROPY_PY_THREAD_GIL (1)
@@ -140,22 +73,10 @@
14073
#define MICROPY_BLUETOOTH_NIMBLE (1)
14174
#define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
14275
#endif
143-
#define MICROPY_PY_UASYNCIO (1)
144-
#define MICROPY_PY_UCTYPES (1)
145-
#define MICROPY_PY_UZLIB (1)
146-
#define MICROPY_PY_UJSON (1)
147-
#define MICROPY_PY_URE (1)
148-
#define MICROPY_PY_URE_SUB (1)
149-
#define MICROPY_PY_UHEAPQ (1)
15076
#define MICROPY_PY_UTIMEQ (1)
151-
#define MICROPY_PY_UHASHLIB (1)
15277
#define MICROPY_PY_UHASHLIB_SHA1 (1)
15378
#define MICROPY_PY_UHASHLIB_SHA256 (1)
15479
#define MICROPY_PY_UCRYPTOLIB (1)
155-
#define MICROPY_PY_UBINASCII (1)
156-
#define MICROPY_PY_UBINASCII_CRC32 (1)
157-
#define MICROPY_PY_URANDOM (1)
158-
#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
15980
#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (esp_random())
16081
#define MICROPY_PY_OS_DUPTERM (1)
16182
#define MICROPY_PY_MACHINE (1)
@@ -192,7 +113,6 @@
192113
#define MICROPY_PY_USSL_FINALISER (1)
193114
#define MICROPY_PY_UWEBSOCKET (1)
194115
#define MICROPY_PY_WEBREPL (1)
195-
#define MICROPY_PY_FRAMEBUF (1)
196116
#define MICROPY_PY_BTREE (1)
197117
#define MICROPY_PY_ONEWIRE (1)
198118
#define MICROPY_PY_UPLATFORM (1)

0 commit comments

Comments
 (0)