From 08d628b8e58cd069a89518db256f26053241c85a Mon Sep 17 00:00:00 2001 From: Aron Rubin Date: Wed, 28 Apr 2021 11:57:59 -0400 Subject: [PATCH 1/2] Added condition to only use tinyusb as needed --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6332f5488e..3684139c982 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,8 +161,11 @@ set(includedirs set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS}) set(priv_includes cores/esp32/libb64) set(requires spi_flash mbedtls mdns esp_adc_cal) -set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt arduino_tinyusb main) +set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt main) +if(IDF_TARGET MATCHES "esp32s[23]|esp32c3" AND CONFIG_TINYUSB_ENABLED) + list(APPEND priv_requires arduino_tinyusb) +endif() if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA) list(APPEND priv_requires esp_https_ota) endif() From 1bc4bbdc0870d0aedac9df01155d40af7cdee681 Mon Sep 17 00:00:00 2001 From: Aron Rubin Date: Thu, 29 Apr 2021 12:00:26 -0400 Subject: [PATCH 2/2] Removed esp32c3 from targets supporting tinyusb --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3684139c982..17b064c3a8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ set(priv_includes cores/esp32/libb64) set(requires spi_flash mbedtls mdns esp_adc_cal) set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt main) -if(IDF_TARGET MATCHES "esp32s[23]|esp32c3" AND CONFIG_TINYUSB_ENABLED) +if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED) list(APPEND priv_requires arduino_tinyusb) endif() if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)