try to fix linking errors

2020-05-30 15:09:01 +03:00
parent 908ee03db4
commit 832edd2c63
70 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -146,7 +146,7 @@ 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 main)
+set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt tinyusb main)

 idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})

--- a/tools/sdk/esp32s2/ld/esp32s2.project.ld
+++ b/tools/sdk/esp32s2/ld/esp32s2.project.ld
--- a/tools/sdk/esp32s2/lib/libapp_trace.a
+++ b/tools/sdk/esp32s2/lib/libapp_trace.a
--- a/tools/sdk/esp32s2/lib/libapp_update.a
+++ b/tools/sdk/esp32s2/lib/libapp_update.a
--- a/tools/sdk/esp32s2/lib/libasio.a
+++ b/tools/sdk/esp32s2/lib/libasio.a
--- a/tools/sdk/esp32s2/lib/libbootloader_support.a
+++ b/tools/sdk/esp32s2/lib/libbootloader_support.a
--- a/tools/sdk/esp32s2/lib/libcbor.a
+++ b/tools/sdk/esp32s2/lib/libcbor.a
--- a/tools/sdk/esp32s2/lib/libcoap.a
+++ b/tools/sdk/esp32s2/lib/libcoap.a
--- a/tools/sdk/esp32s2/lib/libconsole.a
+++ b/tools/sdk/esp32s2/lib/libconsole.a
--- a/tools/sdk/esp32s2/lib/libcxx.a
+++ b/tools/sdk/esp32s2/lib/libcxx.a
--- a/tools/sdk/esp32s2/lib/libdriver.a
+++ b/tools/sdk/esp32s2/lib/libdriver.a
--- a/tools/sdk/esp32s2/lib/libefuse.a
+++ b/tools/sdk/esp32s2/lib/libefuse.a
--- a/tools/sdk/esp32s2/lib/libesp-tls.a
+++ b/tools/sdk/esp32s2/lib/libesp-tls.a
--- a/tools/sdk/esp32s2/lib/libesp32s2.a
+++ b/tools/sdk/esp32s2/lib/libesp32s2.a
--- a/tools/sdk/esp32s2/lib/libesp_common.a
+++ b/tools/sdk/esp32s2/lib/libesp_common.a
--- a/tools/sdk/esp32s2/lib/libesp_eth.a
+++ b/tools/sdk/esp32s2/lib/libesp_eth.a
--- a/tools/sdk/esp32s2/lib/libesp_event.a
+++ b/tools/sdk/esp32s2/lib/libesp_event.a
--- a/tools/sdk/esp32s2/lib/libesp_gdbstub.a
+++ b/tools/sdk/esp32s2/lib/libesp_gdbstub.a
--- a/tools/sdk/esp32s2/lib/libesp_hid.a
+++ b/tools/sdk/esp32s2/lib/libesp_hid.a
--- a/tools/sdk/esp32s2/lib/libesp_http_client.a
+++ b/tools/sdk/esp32s2/lib/libesp_http_client.a
--- a/tools/sdk/esp32s2/lib/libesp_http_server.a
+++ b/tools/sdk/esp32s2/lib/libesp_http_server.a
--- a/tools/sdk/esp32s2/lib/libesp_https_ota.a
+++ b/tools/sdk/esp32s2/lib/libesp_https_ota.a
--- a/tools/sdk/esp32s2/lib/libesp_https_server.a
+++ b/tools/sdk/esp32s2/lib/libesp_https_server.a
--- a/tools/sdk/esp32s2/lib/libesp_local_ctrl.a
+++ b/tools/sdk/esp32s2/lib/libesp_local_ctrl.a
--- a/tools/sdk/esp32s2/lib/libesp_netif.a
+++ b/tools/sdk/esp32s2/lib/libesp_netif.a
--- a/tools/sdk/esp32s2/lib/libesp_ringbuf.a
+++ b/tools/sdk/esp32s2/lib/libesp_ringbuf.a
--- a/tools/sdk/esp32s2/lib/libesp_serial_slave_link.a
+++ b/tools/sdk/esp32s2/lib/libesp_serial_slave_link.a
--- a/tools/sdk/esp32s2/lib/libesp_system.a
+++ b/tools/sdk/esp32s2/lib/libesp_system.a
--- a/tools/sdk/esp32s2/lib/libesp_timer.a
+++ b/tools/sdk/esp32s2/lib/libesp_timer.a
--- a/tools/sdk/esp32s2/lib/libesp_websocket_client.a
+++ b/tools/sdk/esp32s2/lib/libesp_websocket_client.a
--- a/tools/sdk/esp32s2/lib/libesp_wifi.a
+++ b/tools/sdk/esp32s2/lib/libesp_wifi.a
--- a/tools/sdk/esp32s2/lib/libespcoredump.a
+++ b/tools/sdk/esp32s2/lib/libespcoredump.a
--- a/tools/sdk/esp32s2/lib/libexpat.a
+++ b/tools/sdk/esp32s2/lib/libexpat.a
--- a/tools/sdk/esp32s2/lib/libfatfs.a
+++ b/tools/sdk/esp32s2/lib/libfatfs.a
--- a/tools/sdk/esp32s2/lib/libfb_gfx.a
+++ b/tools/sdk/esp32s2/lib/libfb_gfx.a
--- a/tools/sdk/esp32s2/lib/libfreemodbus.a
+++ b/tools/sdk/esp32s2/lib/libfreemodbus.a
--- a/tools/sdk/esp32s2/lib/libfreertos.a
+++ b/tools/sdk/esp32s2/lib/libfreertos.a
--- a/tools/sdk/esp32s2/lib/libheap.a
+++ b/tools/sdk/esp32s2/lib/libheap.a
--- a/tools/sdk/esp32s2/lib/libjsmn.a
+++ b/tools/sdk/esp32s2/lib/libjsmn.a
--- a/tools/sdk/esp32s2/lib/libjson.a
+++ b/tools/sdk/esp32s2/lib/libjson.a
--- a/tools/sdk/esp32s2/lib/liblibsodium.a
+++ b/tools/sdk/esp32s2/lib/liblibsodium.a
--- a/tools/sdk/esp32s2/lib/liblog.a
+++ b/tools/sdk/esp32s2/lib/liblog.a
--- a/tools/sdk/esp32s2/lib/liblwip.a
+++ b/tools/sdk/esp32s2/lib/liblwip.a
--- a/tools/sdk/esp32s2/lib/libmbedcrypto.a
+++ b/tools/sdk/esp32s2/lib/libmbedcrypto.a
--- a/tools/sdk/esp32s2/lib/libmbedtls.a
+++ b/tools/sdk/esp32s2/lib/libmbedtls.a
--- a/tools/sdk/esp32s2/lib/libmbedx509.a
+++ b/tools/sdk/esp32s2/lib/libmbedx509.a
--- a/tools/sdk/esp32s2/lib/libmdns.a
+++ b/tools/sdk/esp32s2/lib/libmdns.a
--- a/tools/sdk/esp32s2/lib/libmqtt.a
+++ b/tools/sdk/esp32s2/lib/libmqtt.a
--- a/tools/sdk/esp32s2/lib/libnewlib.a
+++ b/tools/sdk/esp32s2/lib/libnewlib.a
--- a/tools/sdk/esp32s2/lib/libnghttp.a
+++ b/tools/sdk/esp32s2/lib/libnghttp.a
--- a/tools/sdk/esp32s2/lib/libnvs_flash.a
+++ b/tools/sdk/esp32s2/lib/libnvs_flash.a
--- a/tools/sdk/esp32s2/lib/libopenssl.a
+++ b/tools/sdk/esp32s2/lib/libopenssl.a
--- a/tools/sdk/esp32s2/lib/libperfmon.a
+++ b/tools/sdk/esp32s2/lib/libperfmon.a
--- a/tools/sdk/esp32s2/lib/libprotobuf-c.a
+++ b/tools/sdk/esp32s2/lib/libprotobuf-c.a
--- a/tools/sdk/esp32s2/lib/libprotocomm.a
+++ b/tools/sdk/esp32s2/lib/libprotocomm.a
--- a/tools/sdk/esp32s2/lib/libpthread.a
+++ b/tools/sdk/esp32s2/lib/libpthread.a
--- a/tools/sdk/esp32s2/lib/libsdmmc.a
+++ b/tools/sdk/esp32s2/lib/libsdmmc.a
--- a/tools/sdk/esp32s2/lib/libsoc.a
+++ b/tools/sdk/esp32s2/lib/libsoc.a
--- a/tools/sdk/esp32s2/lib/libsoc_esp32s2.a
+++ b/tools/sdk/esp32s2/lib/libsoc_esp32s2.a
--- a/tools/sdk/esp32s2/lib/libspi_flash.a
+++ b/tools/sdk/esp32s2/lib/libspi_flash.a
--- a/tools/sdk/esp32s2/lib/libspiffs.a
+++ b/tools/sdk/esp32s2/lib/libspiffs.a
--- a/tools/sdk/esp32s2/lib/libtcp_transport.a
+++ b/tools/sdk/esp32s2/lib/libtcp_transport.a
--- a/tools/sdk/esp32s2/lib/libtcpip_adapter.a
+++ b/tools/sdk/esp32s2/lib/libtcpip_adapter.a
--- a/tools/sdk/esp32s2/lib/libulp.a
+++ b/tools/sdk/esp32s2/lib/libulp.a
--- a/tools/sdk/esp32s2/lib/libunity.a
+++ b/tools/sdk/esp32s2/lib/libunity.a
--- a/tools/sdk/esp32s2/lib/libvfs.a
+++ b/tools/sdk/esp32s2/lib/libvfs.a
--- a/tools/sdk/esp32s2/lib/libwear_levelling.a
+++ b/tools/sdk/esp32s2/lib/libwear_levelling.a
--- a/tools/sdk/esp32s2/lib/libwifi_provisioning.a
+++ b/tools/sdk/esp32s2/lib/libwifi_provisioning.a
--- a/tools/sdk/esp32s2/lib/libwpa_supplicant.a
+++ b/tools/sdk/esp32s2/lib/libwpa_supplicant.a
--- a/tools/sdk/esp32s2/lib/libxtensa.a
+++ b/tools/sdk/esp32s2/lib/libxtensa.a