espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 04:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(esptool_py): Re-evalute dependencies of esptool_py

Browse Source 
This commit establishes the foundation for making the esptool_py
component idempotent.

The following changes are made in this commit:

- Removes unnecessary dependency of esp_wifi component on esptool_py.
- Add missing esptool_py dependencies to components which directly use
  esptool_py specific functions or variables but do not declare a public
  or private dependency.
This commit is contained in:
Sudeep Mohanty
2025-07-01 10:30:38 +02:00
parent ce92b0ab60
commit 30083e07be
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/bootloader_support/CMakeLists.txt
View File

@@ -28,7 +28,7 @@ if(esp_tee_build)
idf_component_register(SRCS ${tee_srcs}
INCLUDE_DIRS ${tee_inc_dirs}
PRIV_REQUIRES efuse esp_app_format)
PRIV_REQUIRES efuse esp_app_format esptool_py)
return()
endif()
@@ -72,7 +72,7 @@ endif()
if(BOOTLOADER_BUILD OR CONFIG_APP_BUILD_TYPE_RAM)
set(include_dirs "include" "bootloader_flash/include"
"private_include")
set(priv_requires micro-ecc spi_flash efuse esp_bootloader_format esp_app_format)
set(priv_requires micro-ecc spi_flash efuse esp_bootloader_format esp_app_format esptool_py)
list(APPEND srcs
"src/bootloader_init.c"
"src/bootloader_clock_loader.c"
@@ -89,7 +89,7 @@ else()
set(include_dirs "include" "bootloader_flash/include")
set(priv_include_dirs "private_include")
# heap is required for `heap_memory_layout.h` header
set(priv_requires spi_flash mbedtls efuse heap esp_bootloader_format esp_app_format)
set(priv_requires spi_flash mbedtls efuse heap esp_bootloader_format esp_app_format esptool_py)
endif()
if(BOOTLOADER_BUILD)

2
components/esp_phy/CMakeLists.txt
View File

@@ -55,7 +55,7 @@ endif()
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include" "${idf_target}/include"
PRIV_REQUIRES nvs_flash esp_driver_gpio efuse esp_timer esp_wifi
PRIV_REQUIRES nvs_flash esp_driver_gpio efuse esp_timer esp_wifi esptool_py
LDFRAGMENTS "${ldfragments}"
EMBED_FILES ${embed_files}
)

2
components/esp_tee/CMakeLists.txt
View File

@@ -73,7 +73,7 @@ else()
idf_component_register(INCLUDE_DIRS include
SRCS ${srcs}
PRIV_REQUIRES efuse esp_security esp_system spi_flash)
PRIV_REQUIRES efuse esp_security esp_system spi_flash esptool_py)
if(CONFIG_SECURE_ENABLE_TEE)
set(EXTRA_LINK_FLAGS)

2
components/esp_wifi/CMakeLists.txt
View File

@@ -60,7 +60,7 @@ idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include" "include/local" "wifi_apps/include" "wifi_apps/nan_app/include"
REQUIRES esp_event esp_phy esp_netif
PRIV_REQUIRES esptool_py esp_pm esp_timer nvs_flash
PRIV_REQUIRES esp_pm esp_timer nvs_flash
wpa_supplicant hal lwip esp_coex
PRIV_INCLUDE_DIRS ../wpa_supplicant/src/ ../wpa_supplicant/esp_supplicant/src/
wifi_apps/roaming_app/include

2
components/fatfs/CMakeLists.txt
View File

@@ -24,7 +24,7 @@ else()
list(APPEND requires "sdmmc" "esp_driver_sdmmc" "esp_driver_sdspi")
list(APPEND priv_requires "vfs" "esp_driver_gpio")
list(APPEND priv_requires "vfs" "esp_driver_gpio" "esptool_py")
endif()
idf_component_register(SRCS ${srcs}

2
components/nvs_flash/CMakeLists.txt
View File

@@ -63,7 +63,7 @@ else()
if(${target} STREQUAL "linux")
set(priv_requires spi_flash)
else()
set(priv_requires spi_flash newlib)
set(priv_requires spi_flash newlib esptool_py)
endif()
idf_component_register(SRCS "${srcs}"

2
components/spiffs/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ set(original_srcs "spiffs/src/spiffs_cache.c"
list(APPEND srcs "spiffs_api.c" ${original_srcs})
if(NOT ${target} STREQUAL "linux")
list(APPEND pr bootloader_support esptool_py vfs)
list(APPEND pr bootloader_support vfs esptool_py)
list(APPEND srcs "esp_spiffs.c")
endif()