Merge pull request #2818 from hathach/add-esp32p4

Add esp32p4 OTG HS support

.circleci/config2.yml

@@ -105,7 +105,7 @@ commands:
           name: Build
           command: |
             if [ << parameters.toolchain >> == esp-idf ]; then
-              docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python tools/build.py << parameters.family >>
+              docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.1 python tools/build.py << parameters.family >>
             else
               # Toolchain option default is gcc
               if [ << parameters.toolchain >> == arm-clang ]; then

.github/workflows/build.yml

@@ -85,7 +85,7 @@ jobs:
           - 'msp430-gcc'
           - 'riscv-gcc'
           - 'rx-gcc'
-          - 'esp-idf' # buid-system is ignored
+          - 'esp-idf' # build-system is ignored
     with:
       build-system: 'make'
       toolchain: ${{ matrix.toolchain }}

.github/workflows/build_util.yml

@@ -41,7 +41,7 @@ jobs:
         uses: ./.github/actions/setup_toolchain
         with:
           toolchain: ${{ inputs.toolchain }}
-          toolchain_version: 'v5.1.1'
+          toolchain_version: 'v5.3.1'
 
       - name: Get Dependencies
         uses: ./.github/actions/get_deps
@@ -61,7 +61,7 @@ jobs:
       - name: Build
         run: |
           if [ "${{ inputs.toolchain }}" == "esp-idf" ]; then
-            docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python tools/build.py ${{ matrix.arg }}
+            docker run --rm -v $PWD:/project -w /project espressif/idf:v5.3.1 python tools/build.py ${{ matrix.arg }}
           else
             python tools/build.py -s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ steps.set-one-per-family.outputs.build_option }} ${{ matrix.arg }}
           fi

.github/workflows/ci_set_matrix.py

@@ -45,6 +45,7 @@
     "xmc4000": ["arm-gcc"],
     "-bespressif_kaluga_1": ["esp-idf"],
     "-bespressif_s3_devkitm": ["esp-idf"],
+    "-bespressif_p4_function_ev": ["esp-idf"],
 }
 
 

examples/device/audio_4_channel_mic_freertos/skip.txt

@@ -4,6 +4,7 @@ mcu:CH32V307
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
+mcu:MCXA15
 mcu:MKL25ZXX
 mcu:MSP430x5xx
 mcu:RP2040

examples/device/audio_test_freertos/skip.txt

@@ -4,6 +4,7 @@ mcu:CH32V307
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
+mcu:MCXA15
 mcu:MKL25ZXX
 mcu:MSP430x5xx
 mcu:RP2040

examples/device/cdc_msc_freertos/skip.txt

@@ -4,6 +4,7 @@ mcu:CH32V307
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
+mcu:MCXA15
 mcu:MKL25ZXX
 mcu:MSP430x5xx
 mcu:RP2040

examples/device/hid_composite_freertos/skip.txt

@@ -4,6 +4,7 @@ mcu:CH32V307
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
+mcu:MCXA15
 mcu:MKL25ZXX
 mcu:MSP430x5xx
 mcu:RP2040

examples/device/net_lwip_webserver/skip.txt

@@ -3,6 +3,7 @@ mcu:CH32V20X
 mcu:LPC11UXX
 mcu:LPC13XX
 mcu:LPC15XX
+mcu:MCXA15
 mcu:MSP430x5xx
 mcu:NUC121
 mcu:SAMD11

examples/device/video_capture/skip.txt

@@ -1,5 +1,6 @@
 mcu:CH32V103
 mcu:CH32V20X
+mcu:MCXA15
 mcu:MSP430x5xx
 mcu:NUC121
 mcu:SAMD11

examples/device/video_capture_2ch/skip.txt

@@ -6,6 +6,7 @@ mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
 mcu:STM32L0
+mcu:MCXA15
 family:espressif
 board:curiosity_nano
 board:kuiic

hw/bsp/espressif/boards/CMakeLists.txt

@@ -2,7 +2,5 @@ set(hw_dir "${CMAKE_CURRENT_LIST_DIR}/../../../")
 
 idf_component_register(SRCS family.c
                     INCLUDE_DIRS "." ${BOARD} ${hw_dir}
-                    PRIV_REQUIRES "driver"
+                    PRIV_REQUIRES driver usb
                     REQUIRES led_strip src tinyusb_src)
-
-target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-error=format)

hw/bsp/espressif/boards/adafruit_feather_esp32_v2/board.cmake

@@ -1,2 +1,3 @@
 # Apply board specific content here
 set(IDF_TARGET "esp32")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/adafruit_feather_esp32s2/board.cmake

@@ -1,2 +1,3 @@
 # Apply board specific content here
 set(IDF_TARGET "esp32s2")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/adafruit_feather_esp32s3/board.cmake

@@ -0,0 +1,3 @@
+# Apply board specific content here
+set(IDF_TARGET "esp32s3")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/adafruit_feather_esp32s3/board.h

@@ -0,0 +1,53 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#define NEOPIXEL_PIN          33
+#define NEOPIXEL_POWER_PIN    21
+#define NEOPIXEL_POWER_STATE  1
+
+#define BUTTON_PIN            0
+#define BUTTON_STATE_ACTIVE   0
+
+// SPI for USB host shield
+#define MAX3421_SPI_HOST SPI2_HOST
+#define MAX3421_SCK_PIN  36
+#define MAX3421_MOSI_PIN 35
+#define MAX3421_MISO_PIN 37
+#define MAX3421_CS_PIN   10
+#define MAX3421_INTR_PIN 9
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* BOARD_H_ */

hw/bsp/espressif/boards/adafruit_metro_esp32s2/board.cmake

@@ -1,2 +1,3 @@
 # Apply board specific content here
 set(IDF_TARGET "esp32s2")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/espressif_c3_devkitc/board.cmake

@@ -1,2 +1,3 @@
 # Apply board specific content here
 set(IDF_TARGET "esp32c3")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/espressif_c6_devkitc/board.cmake

@@ -1,2 +1,3 @@
 # Apply board specific content here
 set(IDF_TARGET "esp32c6")
+set(MAX3421_HOST 1)

hw/bsp/espressif/boards/espressif_p4_function_ev/board.cmake

@@ -0,0 +1,2 @@
+# Apply board specific content here
+set(IDF_TARGET "esp32p4")

hw/bsp/espressif/boards/espressif_p4_function_ev/board.h

@@ -0,0 +1,43 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+// #define NEOPIXEL_PIN          48
+
+#define BUTTON_PIN            0
+#define BUTTON_STATE_ACTIVE   0
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* BOARD_H_ */