Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build system: Remove some dependencies from esp32 & esp32s2beta

Browse source 
Possible now that wifi related source files are all in esp_wifi
This commit is contained in:
Angus Gratton 2019-10-31 13:39:17 +11:00 committed by Angus Gratton
parent f616d2f2de
commit 65dad0d46f
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esp32/CMakeLists.txt
View file

@ -36,12 +36,12 @@ else()
"task_wdt.c") "task_wdt.c")
set(include_dirs "include") set(include_dirs "include")
set(requires driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly set(requires driver efuse soc) #unfortunately rom/uart uses SOC registers directly
# driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
# app_update is added here because cpu_start.c uses esp_ota_get_app_description() function. # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
set(priv_requires app_trace app_update bootloader_support log mbedtls nvs_flash pthread set(priv_requires app_trace app_update bootloader_support log mbedtls nvs_flash pthread
spi_flash vfs wpa_supplicant espcoredump esp_common esp_wifi perfmon) spi_flash vfs espcoredump esp_common perfmon)
set(fragments linker.lf ld/esp32_fragments.lf) set(fragments linker.lf ld/esp32_fragments.lf)
idf_component_register(SRCS "${srcs}" idf_component_register(SRCS "${srcs}"

1
components/esp32/cpu_start.c
View file

@ -45,7 +45,6 @@
#include "esp_spi_flash.h" #include "esp_spi_flash.h"
#include "esp_flash_internal.h" #include "esp_flash_internal.h"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "esp_event.h"
#include "esp_spi_flash.h" #include "esp_spi_flash.h"
#include "esp_private/crosscore_int.h" #include "esp_private/crosscore_int.h"
#include "esp_log.h" #include "esp_log.h"

4
components/esp32s2beta/CMakeLists.txt
View file

@ -33,13 +33,13 @@ else()
"task_wdt.c") "task_wdt.c")
set(include_dirs "include") set(include_dirs "include")
set(requires driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly set(requires driver efuse soc) #unfortunately rom/uart uses SOC registers directly
# driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
# app_update is added here because cpu_start.c uses esp_ota_get_app_description() function. # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
set(priv_requires set(priv_requires
app_trace app_update bootloader_support log mbedtls nvs_flash app_trace app_update bootloader_support log mbedtls nvs_flash
pthread spi_flash vfs wpa_supplicant espcoredump esp_common esp_wifi) pthread spi_flash vfs espcoredump esp_common)
set(fragments linker.lf ld/esp32s2beta_fragments.lf) set(fragments linker.lf ld/esp32s2beta_fragments.lf)

1
components/esp_wifi/CMakeLists.txt
View file

@ -19,6 +19,7 @@ idf_component_register(SRCS "src/coexist.c"
"src/wifi_netif.c" "src/wifi_netif.c"
"${idf_target}/esp_adapter.c" "${idf_target}/esp_adapter.c"
INCLUDE_DIRS "include" "${idf_target}/include" INCLUDE_DIRS "include" "${idf_target}/include"
REQUIRES esp_event
PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif
LDFRAGMENTS "${ldfragments}") LDFRAGMENTS "${ldfragments}")

1
components/mbedtls/CMakeLists.txt
View file

@ -45,3 +45,4 @@ set_property(TARGET mbedcrypto APPEND PROPERTY LINK_INTERFACE_LIBRARIES mbedtls)
# Link mbedtls libraries to component library # Link mbedtls libraries to component library
target_link_libraries(${COMPONENT_LIB} INTERFACE ${mbedtls_targets}) target_link_libraries(${COMPONENT_LIB} INTERFACE ${mbedtls_targets})

4
tools/cmake/build.cmake
View file

@ -152,7 +152,9 @@ function(__build_init idf_path)
endforeach() endforeach()
# Set components required by all other components in the build # Set components required by all other components in the build
set(requires_common cxx newlib freertos heap log soc esp_rom esp_common xtensa) #
# - lwip is here so that #include <sys/socket.h> works without any special provisions
set(requires_common cxx newlib freertos heap log lwip soc esp_rom esp_common xtensa)
idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}") idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}")
__build_get_idf_git_revision() __build_get_idf_git_revision()