Merge branch 'feature/refactor_esp_sys_deps' into 'master'

esp-system: removed esp_phy and nvs dependencies, change app update and pm to weak dependencies

Closes IDF-4656

See merge request espressif/esp-idf!17092
This commit is contained in:
Marius Vikhammer
2022-03-25 17:17:43 +08:00
6 changed files with 40 additions and 27 deletions

View File

@@ -22,10 +22,8 @@ set(extra_allowed_components
# 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, esp_system.
# app_update gets added because of bootloader_support, spi_flash, espcoredump.
# bootloader_support, spi_flash, espcoredump should be removed from dependencies;
# esp_system code that reads app version should be made conditional on app_update being included
# (via weak CMake dependency and #if __has_include in C code)
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
@@ -50,9 +48,9 @@ set(extra_components_which_shouldnt_be_included
esp_event
# esp_netif is a dependency of lwip and esp_event, should disappear once lwip is removed.
esp_netif
# esp_phy is a dependency of esp_system and esp_wifi. For the former, it can be made a weak dependency.
# esp_phy is a dependency of esp_wifi.
esp_phy
# esp_pm is pulled in by esp_system and freertos, can be made a weak dependency
# 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
@@ -74,7 +72,6 @@ set(extra_components_which_shouldnt_be_included
# it is hard to make it conditional, need to remove bootloader_support.
mbedtls
# nvs_flash is required by:
# esp_system — no obvious reason, [refactor-todo] why?
# esp_wifi, esp_phy — both should be removed
nvs_flash
# partition_table is pulled in by app_update, esptool_py, bootloader; all to be removed