esp32/boards/GENERIC_C3: Merge with GENERIC_C3_USB.

As the IDF no longer supports earlier revisions of the C3 by default, we now just explicitly support rev 3+ and enable USB (which wasn't supported in earlier revisions). This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
micropython · Aug 15, 2023 · 4815af7 · 4815af7
1 parent 2fbf42d
commit 4815af7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 35 deletions.
diff --git a/ports/esp32/boards/GENERIC_C3/board.md b/ports/esp32/boards/GENERIC_C3/board.md
@@ -0,0 +1,7 @@
+The following files are firmware images that should work on most
+ESP32-C3-based boards with 4MiB of flash, including WROOM and MINI modules,
+that use the revision 3 silicon (or newer).
+
+USB serial/JTAG support is enabled on pin 18 and 19. Note that this
+is not a full USB stack, the C3 just provides a CDC/ACM class serial
+and JTAG interface.
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
@@ -3,4 +3,5 @@ set(IDF_TARGET esp32c3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
+    boards/GENERIC_C3/sdkconfig.c3usb
 )
diff --git a/...p32/boards/GENERIC_C3_USB/sdkconfig.board → ...s/esp32/boards/GENERIC_C3/sdkconfig.c3usb b/...p32/boards/GENERIC_C3_USB/sdkconfig.board → ...s/esp32/boards/GENERIC_C3/sdkconfig.c3usb
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h