Skip to content

Commit 96718b7

Browse files
committed
merge s2 and s3, update cmake for espressif, add tinyusb_src as component
1 parent 99315bc commit 96718b7

File tree

45 files changed

+114
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+114
-651
lines changed

examples/device/cdc_msc_freertos/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ project(${PROJECT})
1616
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
1717

1818
# Check for -DFAMILY=
19-
if(FAMILY MATCHES "^esp32s[2-3]")
20-
else()
19+
if(NOT FAMILY STREQUAL "espressif")
2120
message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
2221
endif()
Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,11 @@
11
idf_component_register(SRCS "main.c" "usb_descriptors.c" "msc_disk.c"
22
INCLUDE_DIRS "."
3-
REQUIRES freertos soc)
4-
5-
file(TO_NATIVE_PATH "${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake" board_cmake)
6-
7-
if(EXISTS ${board_cmake})
8-
include(${board_cmake})
9-
endif()
3+
REQUIRES freertos soc tinyusb_src)
104

115
target_include_directories(${COMPONENT_TARGET} PUBLIC
126
"${TOP}/hw"
13-
"${TOP}/src"
147
)
158

169
target_compile_definitions(${COMPONENT_TARGET} PUBLIC
1710
ESP_PLATFORM
1811
)
19-
20-
target_sources(${COMPONENT_TARGET} PUBLIC
21-
"${TOP}/src/tusb.c"
22-
"${TOP}/src/common/tusb_fifo.c"
23-
"${TOP}/src/device/usbd.c"
24-
"${TOP}/src/device/usbd_control.c"
25-
"${TOP}/src/class/cdc/cdc_device.c"
26-
"${TOP}/src/class/dfu/dfu_rt_device.c"
27-
"${TOP}/src/class/hid/hid_device.c"
28-
"${TOP}/src/class/midi/midi_device.c"
29-
"${TOP}/src/class/msc/msc_device.c"
30-
"${TOP}/src/class/net/ecm_rndis_device.c"
31-
"${TOP}/src/class/net/ncm_device.c"
32-
"${TOP}/src/class/usbtmc/usbtmc_device.c"
33-
"${TOP}/src/class/vendor/vendor_device.c"
34-
"${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c"
35-
)

examples/rules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# ---------------- GNU Make Start -----------------------
99
# ESP32-Sx and RP2040 has its own CMake build system
10-
ifeq (,$(findstring $(FAMILY),esp32s2 esp32s3 rp2040))
10+
ifeq (,$(findstring $(FAMILY),espressif rp2040))
1111

1212
# ---------------------------------------
1313
# Compiler Flags

hw/bsp/esp32s2/boards/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

hw/bsp/esp32s2/boards/adafruit_magtag_29gray/board.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

hw/bsp/esp32s2/boards/espressif_kaluga_1/board.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

hw/bsp/esp32s2/boards/espressif_saola_1/board.cmake

Lines changed: 0 additions & 17 deletions
This file was deleted.

hw/bsp/esp32s2/family.cmake

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)