This should hopefully fix the build.

Author: kdschlosser

builder/__init__.py

@@ -174,14 +174,18 @@ def get_lvgl_version():
 
 
 def set_mp_version(port):
+    # TODO: disable this for the time being. I will need to add an include to point to
+    #       the version file
+    return
+
     mpconfigport = f'lib/micropython/ports/{port}/mpconfigport.h'
 
     with open(mpconfigport, 'rb') as f:
         data = f.read().decode('utf-8')
 
     if 'MICROPY_BANNER_NAME_AND_VERSION' not in data:
         data += (
-            '\n\n#include "genhdr/mpversion.h"\n\n'
+            # '\n\n#include "genhdr/mpversion.h"\n\n'
             '\n\n#define MICROPY_BANNER_NAME_AND_VERSION '
             f'"LVGL ({get_lvgl_version()}) MicroPython (" MICROPY_VERSION_STRING '
             f'") Binding compiled on " MICROPY_BUILD_DATE\n\n'

builder/esp32.py

@@ -1028,6 +1028,7 @@ def find_esp32_ports(chip):
 PANICHANDLER_PATH = 'lib/micropython/ports/esp32/panichandler.c'
 MPHALPORT_PATH = 'lib/micropython/ports/esp32/mphalport.c'
 MAIN_PATH = 'lib/micropython/ports/esp32/main.c'
+MAKEFILE_PATH = 'lib/micropython/ports/esp32/Makefile'
 
 
 if not os.path.exists('micropy_updates/originals/esp32'):
@@ -1272,6 +1273,12 @@ def update_mkrules():
             f.write(data.encode('utf-8'))
 
 
+def update_makefile():
+    data = read_file('esp32', MAKEFILE_PATH)
+    data = data.replace('IDF_COMPONENT_MANAGER=0', 'IDF_COMPONENT_MANAGER=1')
+    write_file(MAKEFILE_PATH, data)
+
+
 def update_main():
     # data = read_file('esp32', MAIN_PATH)
 
@@ -1349,8 +1356,8 @@ def build_sdkconfig(*args):
         'CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y'
     ]
 
-    if board == 'ESP32_GENERIC_S3':
-        base_config.insert(1, 'CONFIG_SPIRAM_XIP_FROM_PSRAM=y')
+    # if board == 'ESP32_GENERIC_S3':
+    #     base_config.insert(1, 'CONFIG_SPIRAM_XIP_FROM_PSRAM=y')
 
     if DEBUG:
         base_config.extend([
@@ -1474,6 +1481,7 @@ def compile(*args):  # NOQA
     update_mpconfigboard()
     update_mpconfigport()
     update_mkrules()
+    update_makefile()
 
     copy_micropy_updates('esp32')