Merge branch 'feat/usb_uart_bridge_support_p4' into 'master'

feat(usb_device): usb uart bridge supports esp32p4

Closes AEGHB-870

See merge request ae_group/esp-iot-solution!1360

Author: YanKE01

.gitlab/ci/build.yml

@@ -805,10 +805,7 @@ build_example_usb_device_usb_uart_bridge:
   extends:
     - .build_examples_template
     - .rules:build:example_usb_device_usb_uart_bridge
-  parallel:
-    matrix:
-      - IMAGE: espressif/idf:release-v4.4
-      - IMAGE: espressif/idf:release-v5.0
+    - .build_idf_active_release_version
   variables:
     EXAMPLE_DIR: examples/usb/device/usb_uart_bridge
 

examples/usb/device/usb_uart_bridge/README.md

@@ -48,9 +48,20 @@ The example using `ESP32-S3-OTG` board by default, the IO configuration is as fo
 |     19      |  USB D-   |             Fixed              |
 |     46      |  UART-RX  |    Link to target board TX     |
 |     45      |  UART-TX  |    Link to target board RX     |
-|     26      | Boot(IO0) | Link to target board Boot(IO0) |
+|     26      |   Boot    |    Link to target board Boot   |
 |      3      | EN (RST)  |  Link to target board EN(RST)  |
 
+If you are using `ESP32-P4-Function-EV-Board` board, the IO configuration is as follows:
+
+| ESP32-P4 IO | Function  |             Remark             |
+| :---------: | :-------: | :----------------------------: |
+|   pin 50    |  USB D+   |             Fixed              |
+|   pin 49    |  USB D-   |             Fixed              |
+|     27      |  UART-RX  |    Link to target board TX     |
+|     46      |  UART-TX  |    Link to target board RX     |
+|      6      |   Boot    |    Link to target board Boot   |
+|      5      | EN (RST)  |  Link to target board EN(RST)  |
+
 ### Build and Flash
 
 1. Make sure `ESP-IDF` is setup successfully
@@ -61,7 +72,7 @@ The example using `ESP32-S3-OTG` board by default, the IO configuration is as fo
     . $HOME/esp/esp-idf/export.sh
     ```
 
-3. Set ESP-IDF build target to `esp32s2` or `esp32s3`
+3. Set ESP-IDF build target to `esp32s2`, `esp32s3` or `esp32p4`
 
     ```bash
     idf.py set-target esp32s3

examples/usb/device/usb_uart_bridge/main/Kconfig.projbuild

@@ -5,27 +5,45 @@ menu "USB UART Bridge Example"
         default y
     config BOARD_AUTODLD_EN_PIN
         int "Auto download EN(RST) pin"
-        default 3
+        range 0 46 if IDF_TARGET_ESP32S2
+        range 0 48 if IDF_TARGET_ESP32S3
+        range 0 54 if IDF_TARGET_ESP32P4
+        default 3 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 5 if IDF_TARGET_ESP32P4
         depends on UART_AUTO_DOWNLOAD
     config BOARD_AUTODLD_BOOT_PIN
         int "Auto download BOOT pin"
-        default 26
+        range 0 46 if IDF_TARGET_ESP32S2
+        range 0 48 if IDF_TARGET_ESP32S3
+        range 0 54 if IDF_TARGET_ESP32P4
+        default 26 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 6 if IDF_TARGET_ESP32P4
         depends on UART_AUTO_DOWNLOAD
     config BOARD_UART_TXD_PIN
         int "UART TXD pin"
-        default 45
+        range 0 46 if IDF_TARGET_ESP32S2
+        range 0 48 if IDF_TARGET_ESP32S3
+        range 0 54 if IDF_TARGET_ESP32P4
+        default 45 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 46 if IDF_TARGET_ESP32P4
     config BOARD_UART_RXD_PIN
         int "UART RXD pin"
-        default 46
+        range 0 46 if IDF_TARGET_ESP32S2
+        range 0 48 if IDF_TARGET_ESP32S3
+        range 0 54 if IDF_TARGET_ESP32P4
+        default 46 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 27 if IDF_TARGET_ESP32P4
     config UART_RX_BUF_SIZE
         int "UART RX buffer size (Bytes)"
-        default 256
+        default 256 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 512 if IDF_TARGET_ESP32P4
     config UART_TX_BUF_SIZE
         int "UART TX buffer size (Bytes)"
         default 1024
     config USB_RX_BUF_SIZE
         int "USB RX buffer size (Bytes)"
-        default 256
+        default 256 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+        default 512 if IDF_TARGET_ESP32P4
     config USB_TX_BUF_SIZE
         int "USB TX buffer size (Bytes)"
         default 1024

examples/usb/device/usb_uart_bridge/main/idf_component.yml

@@ -1,8 +1,9 @@
 targets:
   - esp32s2
   - esp32s3
+  - esp32p4
 dependencies:
   espressif/esp_tinyusb:
-    version: "~=1.3.1"
+    version: "^1.7.0"
     rules:
       - if: "idf_version >=5.0"

examples/usb/device/usb_uart_bridge/main/usb_uart_bridge_main.c

@@ -70,7 +70,11 @@ static void board_uart_init(void)
         .parity = CFG_PARITY(s_parity_active),
         .stop_bits = CFG_STOP_BITS(s_stop_bits_active),
         .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+#if CONFIG_IDF_TARGET_ESP32P4
+        .source_clk = UART_SCLK_DEFAULT,
+#else
         .source_clk = UART_SCLK_APB,
+#endif
     };
 
     uart_driver_install(BOARD_UART_PORT, UART_RX_BUF_SIZE, UART_TX_BUF_SIZE, 0, NULL, 0);