esp32: Customise ULP module inclusion.

purewack · purewack · commit d4ce7177faa9 · 2024-12-22T14:11:10.000Z
Add the ability to disable the built in ULP module
using mpconfigport.h
Add the ability to compile custom ULP image into
the build by defining the cmake variables:
    ulp_app_name
    ulp_sources
    ulp_exp_dep_srcs

Signed-off-by: Damian Nowacki (purewack) &lt;bobimaster15@gmail.com&gt;
diff --git a/ports/esp32/esp32_common.cmake b/ports/esp32/esp32_common.cmake
@@ -202,6 +202,14 @@ idf_component_register(
         ${IDF_COMPONENTS}
 )
 
+# If a ULP binary image is to be embedded into the build, you can define the
+# appropriate variables to have ESP-IDF build it for your board using your
+# mpconfigboard.cmake
+if(DEFINED ulp_app_name)
+message("ULP embedded APP: ${ulp_app_name} ${ulp_sources} ${ulp_exp_dep_srcs}")
+ulp_embed_binary(${ulp_app_name} "${ulp_sources}" "${ulp_exp_dep_srcs}")
+endif()
+
 # Set the MicroPython target as the current (main) IDF component target.
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 
-#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if MICROPY_PY_ULP && (CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
 
 #if CONFIG_IDF_TARGET_ESP32
 #include "esp32/ulp.h"
@@ -104,4 +104,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &esp32_ulp_locals_dict
     );
 
-#endif // CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#endif // MICROPY_PY_ULP && (CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
@@ -232,7 +232,7 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
     { MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
-    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #if MICROPY_PY_ULP && (CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_ROM_PTR(&esp32_ulp_type) },
     #endif
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -87,6 +87,9 @@
 #define MICROPY_GC_SPLIT_HEAP_AUTO          (1)
 
 // extended modules
+#ifndef MICROPY_PY_ULP
+#define MICROPY_PY_ULP                      (1)
+#endif
 #ifndef MICROPY_PY_ESPNOW
 #define MICROPY_PY_ESPNOW                   (1)
 #endif
