summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-04-08 23:56:28 +1000
committerDamien George <damien@micropython.org>2021-04-09 13:33:26 +1000
commitab9d47e0230768f82a735343fa5b58e2029d8eda (patch)
tree4aade17c9ecb6394f19f04d902d8871f209df802
parent212fe7f33e7427899ee245cda5ab1776b38a79e2 (diff)
esp32: Enable btree module.
This was disabled with the move to CMake, and this commit reinstates it. Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/esp32/main/CMakeLists.txt4
-rw-r--r--ports/esp32/mpconfigport.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 2223ecd03..aacdd40d3 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -149,6 +149,7 @@ set(MICROPY_CROSS_FLAGS -march=xtensawin)
# Set compile options for this port.
target_compile_definitions(${MICROPY_TARGET} PUBLIC
+ ${MICROPY_DEF_CORE}
MICROPY_ESP_IDF_4=1
MICROPY_VFS_FAT=1
MICROPY_VFS_LFS2=1
@@ -164,7 +165,8 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
-Wno-missing-field-initializers
)
-# add usermod
+# Add additional extmod and usermod components.
+target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
target_link_libraries(${MICROPY_TARGET} usermod)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 392f8c749..c9c4b6268 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -162,6 +162,7 @@
#define MICROPY_PY_UWEBSOCKET (1)
#define MICROPY_PY_WEBREPL (1)
#define MICROPY_PY_FRAMEBUF (1)
+#define MICROPY_PY_BTREE (1)
#define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL)
#define MICROPY_PY_BLUETOOTH_RANDOM_ADDR (1)
#define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")