espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 22:54:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/flash_target_deps_on_spiffs_gen_images' into 'master'

Browse Source 
spiffs: restore dependency of flash targets on spiffs images

See merge request espressif/esp-idf!8277
This commit is contained in:
Angus Gratton
2020-04-08 12:43:11 +08:00
parent 6c1f12066d 9a020cbb40
commit 573d5f4eb0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/spiffs/project_include.cmake
View File

@@ -47,14 +47,16 @@ function(spiffs_create_partition_image partition base_dir)
ADDITIONAL_MAKE_CLEAN_FILES ADDITIONAL_MAKE_CLEAN_FILES
${image_file}) ${image_file})
idf_component_get_property(main_args esptool_py FLASH_ARGS) idf_component_get_property(main_args esptool_py FLASH_ARGS)
idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS) idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS)
esptool_py_flash_target(${partition}-flash "${main_args}" "${sub_args}") esptool_py_flash_target(${partition}-flash "${main_args}" "${sub_args}")
esptool_py_flash_target_image(${partition}-flash "${partition}" "${offset}" "${image_file}") esptool_py_flash_target_image(${partition}-flash "${partition}" "${offset}" "${image_file}")
add_dependencies(${partition}-flash spiffs_${partition}_bin)
if(arg_FLASH_IN_PROJECT) if(arg_FLASH_IN_PROJECT)
esptool_py_flash_target_image(flash "${partition}" "${offset}" "${image_file}") esptool_py_flash_target_image(flash "${partition}" "${offset}" "${image_file}")
add_dependencies(flash spiffs_${partition}_bin)
endif() endif()
else() else()
set(message "Failed to create SPIFFS image for partition '${partition}'. " set(message "Failed to create SPIFFS image for partition '${partition}'. "