ESP32 Arduino v3.1 libs from ESP-IDF v5.3 (#208)

* fix(build): Changes required to build against IDF v5.3

* Use unified Xtensa toolchain

* add(build): Add initial ESP32-P4 skeleton

Chip is not selected by default and has only one memory and bootloader configuration. This is the minimum required to issue `build.sh -t esp32p4` which will currently fail, because Arduino support is not yet ready

* feat(esp32p4): Build libs for ESP32-P4 (#221)

* feat(esp32p4): Build libs for ESP32-P4

* Add target to workflows

* Enable in builds

* Remove bluedroid patch

* Add P4 to libspi

* Add P4 mem variants

* Update SDK in JSON even if version did not change (#223)

* Do not build matter for ESP32-P4

* Update ESP-DL configuration

* Add additional DL models and use extra components only when needed

* Use extra DL models only on S3 and P4

* Switch to the new ESP-DL only for ESP32-P4

* Rename old DL component and revert the name of the new

* Enable TinyUSB build for ESP32P4

* Add support for HighSpeed USB in arduino_tinyusb

* Update tinyusb dcd_dwc2

* Add P4 configuration for PSRAM, WDT and ESP-HOSTED

* Update dcd_dwc2.c

* Remove conditional inclusion of builder specified components

CCACHE is very fast and it also causes issues with memory variants

* Do not use ESP-DL on P4

* Update P4 PSRAM Speed to 200MHz

* Fixes Matter over WiFi to disable OpenThread (#232)

* Fixes Matter over WiFi to disable OpenThread

* fix flag value

* disables Matter Stack WiFi manager

* rollback Matter WiFi Manager changes

* Add define to signify that prebuilt libs are used

* Enable FreeRTOS Trace Facility (#234)

* Enable FreeRTOS Trace Facility

* Enable more statistics

* fix(docker): Add docker tag to run scripts in 5.3 branch (#236)

* fix(docker): Add docker tag to run scripts in 5.3 branch

* Add additional info

* fix(zigbee): Unlink the zigbee libs (#242)

* fix(): Move mkdir to top as its already used

* Update TinyUSB DCD Source

* Add missing compile source from TinyUSB

* Fix path to TinyUSB dwc2_common.c

* Update TinyUSB DCD

* Update TinyUSB DCD

* Update dcd_dwc2.c

* Update dcd_dwc2.c

* Update copy-libs.sh

* Support rev 0 for P4 (#254)

* Support rev 0 for P4

* Revert C6 slave idf target

* Fix the crash for esp32 and esp32c3 (#248)

* fix(trademark): Remove 3rd party trademarks from scripts (#255)

* Update dcd_dwc2.c

* Prepare for merging release/v5.3 into master

---------

Co-authored-by: Lucas Saavedra Vaz <[email protected]>
Co-authored-by: Rodrigo Garcia <[email protected]>
Co-authored-by: Jan Procházka <[email protected]>
Co-authored-by: kvp1703 <[email protected]>

Author: 5 people

.github/workflows/cron.yml

@@ -36,5 +36,5 @@ jobs:
             lib_builder_branch: "release/v5.1"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
           - idf_branch: "release/v5.3"
-            lib_builder_branch: "release/v5.3"
+            lib_builder_branch: "master"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"

.github/workflows/push.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2]
+        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
       fail-fast: false
     steps:
     - uses: actions/checkout@v4

CMakeLists.txt

@@ -34,6 +34,8 @@ add_custom_command(
 )
 add_custom_target(mem-variant DEPENDS "mem_variant")
 
+idf_build_set_property(COMPILE_DEFINITIONS "-DESP32_ARDUINO_LIB_BUILDER" APPEND)
+
 ##################
 ### ESP Matter ###
 ##################

build.sh

@@ -305,14 +305,14 @@ if [ "$BUILD_TYPE" = "all" ]; then
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
-# Generate PlatformIO manifest file
+# Generate pioarduino manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    echo "* Generating PlatformIO manifest file..."
+    echo "* Generating pioarduino manifest file..."
     pushd $IDF_PATH
     ibr=$(git describe --all 2>/dev/null)
     ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
     popd
-    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
+    python3 ./tools/gen_pioarduino_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 

components/arduino_tinyusb/CMakeLists.txt

@@ -27,7 +27,8 @@ if(CONFIG_TINYUSB_ENABLED)
       # espressif:
       "${COMPONENT_DIR}/src/dcd_dwc2.c"
       # tusb:
-      #"{COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c"
+      #"${COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c"
+      "${COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dwc2_common.c"
       "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c"

components/arduino_tinyusb/Kconfig.projbuild

@@ -4,7 +4,7 @@ menu "Arduino TinyUSB"
     config TINYUSB_ENABLED
         bool "Enable TinyUSB driver"
         default y
-        depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
         select FREERTOS_SUPPORT_STATIC_ALLOCATION
         select FREERTOS_USE_AUTHENTIC_INCLUDE_PATHS
         help
@@ -28,14 +28,16 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_CDC_RX_BUFSIZE
             int "CDC FIFO size of RX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_CDC_ENABLED
             help
                 CDC FIFO size of RX
 
         config TINYUSB_CDC_TX_BUFSIZE
             int "CDC FIFO size of TX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_CDC_ENABLED
             help
                 CDC FIFO size of TX
@@ -86,7 +88,8 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_HID_BUFSIZE
             int "HID Buffer size"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_HID_ENABLED
             help
                 HID Buffer size. Should be sufficient to hold ID (if any) + Data
@@ -111,14 +114,16 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_MIDI_RX_BUFSIZE
             int "MIDI FIFO size of RX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_MIDI_ENABLED
             help
                 MIDI FIFO size of RX
 
         config TINYUSB_MIDI_TX_BUFSIZE
             int "MIDI FIFO size of TX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_MIDI_ENABLED
             help
                 MIDI FIFO size of TX
@@ -143,8 +148,9 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_VIDEO_STREAMING_BUFSIZE
             int "VIDEO streaming endpoint size"
-            range 0 64
-            default 64
+            range 0 512
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_VIDEO_ENABLED
             help
                 VIDEO streaming endpoint size
@@ -219,14 +225,16 @@ menu "Arduino TinyUSB"
 
         config TINYUSB_VENDOR_RX_BUFSIZE
             int "VENDOR FIFO size of RX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_VENDOR_ENABLED
             help
                 VENDOR FIFO size of RX
 
         config TINYUSB_VENDOR_TX_BUFSIZE
             int "VENDOR FIFO size of TX"
-            default 64
+            default 64 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+            default 512 if IDF_TARGET_ESP32P4
             depends on TINYUSB_VENDOR_ENABLED
             help
                 VENDOR FIFO size of TX

components/arduino_tinyusb/include/tusb_config.h

@@ -100,11 +100,18 @@ extern "C" {
 #   define CFG_TUSB_MEM_ALIGN       TU_ATTR_ALIGNED(4)
 #endif
 
+#if CONFIG_IDF_TARGET_ESP32P4
+#define CFG_TUD_MAX_SPEED OPT_MODE_HIGH_SPEED
+#else
+#define CFG_TUD_MAX_SPEED OPT_MODE_FULL_SPEED
+#endif
+
 /*                      */
 /* DRIVER CONFIGURATION */
 /*                      */
 
 #define CFG_TUD_MAINTASK_SIZE 		4096
+#define CFG_TUD_ENDOINT_SIZE 		(TUD_OPT_HIGH_SPEED ? 512 : 64)
 #define CFG_TUD_ENDOINT0_SIZE 		64
 
 // Enabled Drivers

components/arduino_tinyusb/patches/dcd_dwc2.patch

@@ -1,10 +1,10 @@
 --- a/components/arduino_tinyusb/src/dcd_dwc2.c	2024-10-02 12:17:40.000000000 +0300
 +++ b/components/arduino_tinyusb/src/dcd_dwc2.c	2024-10-02 12:19:48.000000000 +0300
-@@ -316,6 +316,16 @@
+@@ -243,6 +243,17 @@
  //--------------------------------------------------------------------
  // Endpoint
  //--------------------------------------------------------------------
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +// Keep count of how many FIFOs are in use
 +static uint8_t _allocated_fifos = 1; //FIFO0 is always in use
 +
@@ -14,68 +14,69 @@
 +  return 0;
 +}
 +#endif
- 
- static void edpt_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc) {
++
+ static void edpt_activate(uint8_t rhport, const tusb_desc_endpoint_t* p_endpoint_desc) {
    dwc2_regs_t* dwc2 = DWC2_REG(rhport);
-@@ -336,7 +346,18 @@
-     dwc2->epout[epnum].doepctl = dxepctl;
-     dwc2->daintmsk |= TU_BIT(DAINTMSK_OEPM_Pos + epnum);
-   } else {
--    dwc2->epin[epnum].diepctl = dxepctl | (epnum << DIEPCTL_TXFNUM_Pos);
+   const uint8_t epnum = tu_edpt_number(p_endpoint_desc->bEndpointAddress);
+@@ -266,7 +277,18 @@
+     depctl.bm.set_data0_iso_even = 1;
+   }
+   if (dir == TUSB_DIR_IN) {
+-    depctl.bm.tx_fifo_num = epnum;
++    //depctl.bm.tx_fifo_num = epnum;
 +    uint8_t fifo_num = epnum;
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    // Special Case for EP5, which is used by CDC but not actually called by the driver
 +    // we can give it a fake FIFO
 +    if (epnum == 5) {
 +      fifo_num = epnum;
 +    } else {
 +      fifo_num = get_free_fifo();
 +    }
-+    //TU_ASSERT(fifo_num != 0);
 +#endif
-+    dwc2->epin[epnum].diepctl = dxepctl | (fifo_num << DIEPCTL_TXFNUM_Pos);
-     dwc2->daintmsk |= TU_BIT(DAINTMSK_IEPM_Pos + epnum);
++    depctl.bm.tx_fifo_num = fifo_num;
    }
- }
-@@ -850,6 +871,10 @@
-     xfer_status[n][TUSB_DIR_IN].max_size = 0;
+ 
+   dwc2_dep_t* dep = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][epnum];
+@@ -557,6 +579,10 @@
+     }
    }
 
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +  _allocated_fifos = 1;
 +#endif
 +
    dfifo_flush_tx(dwc2, 0x10); // all tx fifo
    dfifo_flush_rx(dwc2);
 
-@@ -1204,6 +1229,9 @@
-   if (int_status & GINTSTS_USBRST) {
+@@ -997,6 +1023,9 @@
+   if (gintsts & GINTSTS_USBRST) {
      // USBRST is start of reset.
      dwc2->gintsts = GINTSTS_USBRST;
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    _allocated_fifos = 1;
 +#endif
-     bus_reset(rhport);
+     handle_bus_reset(rhport);
    }
 
-@@ -1235,7 +1263,11 @@
+@@ -1008,7 +1037,11 @@
 
-   if (int_status & GINTSTS_USBSUSP) {
+   if (gintsts & GINTSTS_USBSUSP) {
      dwc2->gintsts = GINTSTS_USBSUSP;
 -    dcd_event_bus_signal(rhport, DCD_EVENT_SUSPEND, true);
 +    //dcd_event_bus_signal(rhport, DCD_EVENT_SUSPEND, true);
 +    dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    _allocated_fifos = 1;
 +#endif
    }
 
-   if (int_status & GINTSTS_WKUINT) {
-@@ -1252,6 +1284,9 @@
+   if (gintsts & GINTSTS_WKUINT) {
+@@ -1025,6 +1058,9 @@
 
      if (otg_int & GOTGINT_SEDET) {
        dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);
-+#if defined(TUP_USBIP_DWC2_ESP32)
++#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +      _allocated_fifos = 1;
 +#endif
      }