ports/esp32: Use shared/tinyusb integration.

Uses newer libusb synopsys/dwc2 driver rather than the IDF tinyusb component. Signed-off-by: Andrew Leech <andrew@alelec.net>
micropython · Jun 20, 2024 · 2c602ca · 2c602ca
1 parent 457e02a
commit 2c602ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
@@ -107,4 +107,5 @@ size-files:
 submodules:
 	@GIT_SUBMODULES=$$(idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build 2>&1 | \
 	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
+	if [ "$$GIT_SUBMODULES" = "" ]; then idf.py $(IDFPY_FLAGS) -B $(BUILD)/submodules -D ECHO_SUBMODULES=1 build; fi; \
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
diff --git a/tools/ci.sh b/tools/ci.sh
@@ -132,7 +132,8 @@ function ci_esp32_idf_setup {
 function ci_esp32_build_common {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2 submodules
+    echo "*** make ${MAKEOPTS} -C ports/esp32 submodules"
+    make ${MAKEOPTS} -C ports/esp32 submodules
 }
 
 function ci_esp32_build_cmod_spiram_s2 {
@@ -146,6 +147,8 @@ function ci_esp32_build_cmod_spiram_s2 {
     ci_native_mpy_modules_build xtensawin
 
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC BOARD_VARIANT=SPIRAM
+    echo "*** make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2 submodules"
+    make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2 submodules
     make ${MAKEOPTS} -C ports/esp32 BOARD=ESP32_GENERIC_S2
 }