Merge branch 'bugfix/partition_table_depends_esptoolpy' into 'master'

esptool_py: Fix issue where build with limited components doesn't include esptool_py

Closes IDFGH-4876 and IDFGH-4874

See merge request espressif/esp-idf!12653

components/app_update/CMakeLists.txt

@@ -1,7 +1,8 @@
 idf_component_register(SRCS "esp_ota_ops.c"
                             "esp_app_desc.c"
                     INCLUDE_DIRS "include"
-                    REQUIRES spi_flash partition_table bootloader_support)
+                    REQUIRES spi_flash partition_table bootloader_support
+                    PRIV_REQUIRES esptool_py)
 
 # esp_app_desc structure is added as an undefined symbol because otherwise the
 # linker will ignore this structure as it has no other files depending on it.

components/bootloader/CMakeLists.txt

@@ -1,4 +1,4 @@
-idf_component_register(PRIV_REQUIRES partition_table)
+idf_component_register(PRIV_REQUIRES partition_table esptool_py)
 
 # Do not generate flash file when building bootloader or is in early expansion of the build
 if(BOOTLOADER_BUILD OR NOT CONFIG_APP_BUILD_BOOTLOADER)

components/esp_wifi/CMakeLists.txt

@@ -35,9 +35,9 @@ idf_component_register(SRCS "src/coexist.c"
                             "src/wifi_netif.c"
                             "${idf_target}/esp_adapter.c"
                     INCLUDE_DIRS "include" "${idf_target}/include"
-                    PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif driver ${extra_priv_requires}
                     REQUIRES esp_event
-                    PRIV_REQUIRES esp_timer esp_pm wpa_supplicant nvs_flash esp_netif ${extra_priv_requires}
+                    PRIV_REQUIRES driver esptool_py esp_netif esp_pm esp_timer nvs_flash
+                                  wpa_supplicant ${extra_priv_requires}
                     LDFRAGMENTS "${ldfragments}")
 
 idf_build_get_property(build_dir BUILD_DIR)

components/partition_table/CMakeLists.txt

@@ -1,4 +1,4 @@
-idf_component_register()
+idf_component_register(PRIV_REQUIRES esptool_py)
 
 if(BOOTLOADER_BUILD)
     return()

components/spiffs/CMakeLists.txt

@@ -8,6 +8,6 @@ idf_component_register(SRCS "esp_spiffs.c"
                     INCLUDE_DIRS "include"
                     PRIV_INCLUDE_DIRS "." "spiffs/src"
                     REQUIRES spi_flash
-                    PRIV_REQUIRES bootloader_support)
+                    PRIV_REQUIRES bootloader_support esptool_py)
 
 set_source_files_properties(spiffs/src/spiffs_nucleus.c PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation)