andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix build for esp32

Browse Source
This commit is contained in:
hathach
2023-04-03 17:44:05 +07:00
parent 1911c613c7
commit 5ef260d5fc
13 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_esp.yml vendored
View File

@@ -54,7 +54,7 @@ jobs:
path: linkermap path: linkermap
- name: Build - name: Build
run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32sx.py ${{ matrix.board }} run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32.py ${{ matrix.board }}
- name: Linker Map - name: Linker Map
run: | run: |

1
examples/CMakeLists.txt
View File

@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
#set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
include(${CMAKE_CURRENT_SOURCE_DIR}/../hw/bsp/family_support.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/../hw/bsp/family_support.cmake)
project(tinyusb_examples) project(tinyusb_examples)

1
hw/bsp/espressif/boards/adafruit_feather_esp32s2/board.cmake
View File

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

1
hw/bsp/espressif/boards/adafruit_magtag_29gray/board.cmake
View File

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

1
hw/bsp/espressif/boards/adafruit_metro_esp32s2/board.cmake
View File

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

1
hw/bsp/espressif/boards/espressif_addax_1/board.cmake
View File

@@ -1,3 +1,2 @@
# Apply board specific content here # Apply board specific content here
set(IDF_TARGET "esp32s3") set(IDF_TARGET "esp32s3")
set(FAMILY_MCUS ESP32S3)

1
hw/bsp/espressif/boards/espressif_kaluga_1/board.cmake
View File

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

1
hw/bsp/espressif/boards/espressif_s3_devkitc/board.cmake
View File

@@ -1,3 +1,2 @@
# Apply board specific content here # Apply board specific content here
set(IDF_TARGET "esp32s3") set(IDF_TARGET "esp32s3")
set(FAMILY_MCUS ESP32S3)

1
hw/bsp/espressif/boards/espressif_s3_devkitm/board.cmake
View File

@@ -1,3 +1,2 @@
# Apply board specific content here # Apply board specific content here
set(IDF_TARGET "esp32s3") set(IDF_TARGET "esp32s3")
set(FAMILY_MCUS ESP32S3)

1
hw/bsp/espressif/boards/espressif_saola_1/board.cmake
View File

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

6
hw/bsp/espressif/family.cmake
View File

@@ -3,6 +3,12 @@ cmake_minimum_required(VERSION 3.5)
# Apply board specific content i.e IDF_TARGET must be set before project.cmake is included # Apply board specific content i.e IDF_TARGET must be set before project.cmake is included
include("${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake") include("${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake")
if(IDF_TARGET STREQUAL "esp32s2")
set(FAMILY_MCUS ESP32S2)
elseif(IDF_TARGET STREQUAL "esp32s3")
set(FAMILY_MCUS ESP32S3)
endif()
# Add example src and bsp directories # Add example src and bsp directories
set(EXTRA_COMPONENT_DIRS "src" "${CMAKE_CURRENT_LIST_DIR}/boards" "${CMAKE_CURRENT_LIST_DIR}/components") set(EXTRA_COMPONENT_DIRS "src" "${CMAKE_CURRENT_LIST_DIR}/boards" "${CMAKE_CURRENT_LIST_DIR}/components")

0
tools/build_esp32sx.py → tools/build_esp32.py
View File

7
tools/build_utils.py
View File

@@ -53,6 +53,13 @@ def skip_example(example, board):
token = token.strip("\"") token = token.strip("\"")
_, opt_mcu = token.split("=") _, opt_mcu = token.split("=")
mcu = opt_mcu[len("OPT_MCU_"):] mcu = opt_mcu[len("OPT_MCU_"):]
break
if "esp32s2" in token:
mcu = "ESP32S2"
break
if "esp32s3" in token:
mcu = "ESP32S3"
break
# Skip all OPT_MCU_NONE these are WIP port # Skip all OPT_MCU_NONE these are WIP port
if mcu == "NONE": if mcu == "NONE":