mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-21 06:56:11 -04:00
47659be5b8
lwip was added to common requirements list to provide "sys/socket.h" header to all components without additional requirements specified. However, lwip pulls in a lot of dependencies on other components. This commit removes lwip from common requirements to reduce the number of components in G1-only apps. To compensate for this removal, the following changes are made: - newlib (which is a common requirement) has a public dependency on lwip if lwip is present in the build. This ensures that sys/socket.h is available as long as lwip component is included into the build. - lwip is now a public requirement of esp-tls since esp_tls.h includes sys/socket.h header. - lwip is now a public requirement o esp_http_client because sys/socket.h is included from esp_http_client.h - lwip is now a private requirement of esp_wifi for "smartconfig_ack" - lwip is now a private requirement of mqtt for socket functions - lwip is now a public requirement of tcp_transport because esp_transport_tcp.h includes sys/socket.h header. - mbedtls checks if lwip component is present in the build. If yes, net_sockets.c is added to the build, along with the dependency on lwip. Previously lwip was a public requirement of mbedtls unconditionally. system/g1_components test app is updated to reflect the changes Default public dependencies of a component before and after this change, except common requirements: - esp_timer (public dependency of freertos) - bootloader_support (public dependency of esp_hw_support) - vfs (public dependency of lwip) - esp_wifi (public dependency of lwip) - esp_event (public dependency of esp_wifi) - esp_netif (public dependency of esp_event) - esp_eth (public dependency of esp_netif) - esp_phy (public dependency of esp_wifi) After: - esp_timer (public dependency of freertos) - bootloader_support (public dependency of esp_hw_support) Altogether, the following components have been always added as public requirements to all other components, and are not added now ([breaking-change]): - lwip - vfs - esp_wifi - esp_event - esp_netif - esp_eth - esp_phy Application components now need to explicitly declare dependencies on these components.
83 lines
3.7 KiB
CMake
83 lines
3.7 KiB
CMake
# For more information about build system see
|
|
# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
|
|
# The following five lines of boilerplate have to be in your project's
|
|
# CMakeLists in this exact order for cmake to work correctly
|
|
cmake_minimum_required(VERSION 3.5)
|
|
|
|
set(g0_components soc hal esp_common esp_rom) # also <arch>, i.e. xtensa or riscv, will be added below
|
|
set(g1_components spi_flash freertos log heap newlib esp_system esp_hw_support)
|
|
set(COMPONENTS ${g0_components} ${g1_components} main)
|
|
|
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
|
|
|
idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH_ENABLED 1)
|
|
|
|
project(g1_components)
|
|
|
|
set(extra_allowed_components
|
|
${CONFIG_IDF_TARGET_ARCH}
|
|
${CONFIG_IDF_TARGET}
|
|
)
|
|
|
|
# These components are currently included into "G1" build, but shouldn't.
|
|
# After removing the extra dependencies, remove the components from this list as well.
|
|
set(extra_components_which_shouldnt_be_included
|
|
# app_update gets added because of bootloader_support, spi_flash, espcoredump.
|
|
# bootloader_support, spi_flash, espcoredump should be removed from dependencies;
|
|
app_update
|
|
# of G1 components, bootloader is only included from spi_flash
|
|
# [refactor-todo]: see if this dependency from spi_flash can be made weak
|
|
bootloader
|
|
# bootloader_support is a dependency of efuse, app_update, spi_flash.
|
|
# efuse and app_update should be removed from G1 build;
|
|
# [refactor-todo]: see if the dependency from spi_flash can be made weak
|
|
bootloader_support
|
|
# [refactor-todo]: should cxx be in G1? Can it exist without FreeRTOS?
|
|
cxx
|
|
# [refactor-todo]: driver is a dependency of esp_pm, esp_timer, spi_flash, vfs, esp_wifi, ${IDF_TARGET}
|
|
# all of these should be removed from G1 except for spi_flash.
|
|
driver
|
|
# [refactor-todo]: efuse is a dependency of esp_hw_support, esp_system.
|
|
# Figure out if these components can exist without a dependency on efuse.
|
|
# If not, see if esp_hw_support can provide minimal efuse component replacement in G1 build.
|
|
efuse
|
|
# esp_pm is pulled in by freertos, can be made a weak dependency
|
|
# conditional on related Kconfig option. It is also used by esp_wifi, driver, mbedtls,
|
|
# all of which should be removed from G1-only build.
|
|
esp_pm
|
|
# esp_ringbuf is a dependency of driver, which should be removed.
|
|
esp_ringbuf
|
|
# esp_timer is a dependency of freertos, esp_event, esp_wifi, driver.
|
|
# For freertos, it can be made a weak dependency conditional on FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER
|
|
esp_timer
|
|
# esptool_py is a dependency of bootloader, esp_wifi, app_update, partition_table, all of which
|
|
# should be removed from G1-only build.
|
|
esptool_py
|
|
# mbedtls is a dependency of bootloader_support (plus other easier-to-remove ones)
|
|
# it is hard to make it conditional, need to remove bootloader_support.
|
|
mbedtls
|
|
# partition_table is pulled in by app_update, esptool_py, bootloader; all to be removed
|
|
partition_table
|
|
# pthread is required by esp_system (for initialization only, can be made a weak dependency)
|
|
# and cxx. See also [refactor-todo] about cxx, can it work without pthread?
|
|
pthread
|
|
)
|
|
|
|
set(expected_components
|
|
${COMPONENTS}
|
|
${extra_allowed_components}
|
|
${extra_components_which_shouldnt_be_included}
|
|
)
|
|
|
|
list(SORT expected_components)
|
|
|
|
|
|
idf_build_get_property(build_components BUILD_COMPONENTS)
|
|
list(SORT build_components)
|
|
|
|
if(NOT "${expected_components}" STREQUAL "${build_components}")
|
|
message(FATAL_ERROR "Unexpected components list in G1 build. "
|
|
"Expected: ${expected_components}. "
|
|
"Actual: ${build_components}")
|
|
endif()
|