Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_failure_on_spiffsgen_clean_project' into 'master'

Browse source 
spiffs: fix build issue on clean project

See merge request espressif/esp-idf!6596
This commit is contained in:
Angus Gratton 2020-01-13 12:14:04 +08:00
parent 0929c91d1a 77585bd14e
commit 28d64e7f82
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
components/spiffs/project_include.cmake
View file

@ -15,40 +15,46 @@ function(spiffs_create_partition_image partition base_dir)
partition_table_get_partition_info(size "--partition-name ${partition}" "size") partition_table_get_partition_info(size "--partition-name ${partition}" "size")
partition_table_get_partition_info(offset "--partition-name ${partition}" "offset") partition_table_get_partition_info(offset "--partition-name ${partition}" "offset")
set(image_file ${CMAKE_BINARY_DIR}/${partition}.bin) if("${size}" AND "${offset}")
set(image_file ${CMAKE_BINARY_DIR}/${partition}.bin)
if(CONFIG_SPIFFS_USE_MAGIC) if(CONFIG_SPIFFS_USE_MAGIC)
set(use_magic "--use-magic") set(use_magic "--use-magic")
endif() endif()
if(CONFIG_SPIFFS_USE_MAGIC_LENGTH) if(CONFIG_SPIFFS_USE_MAGIC_LENGTH)
set(use_magic_len "--use-magic-len") set(use_magic_len "--use-magic-len")
endif() endif()
if(CONFIG_SPIFFS_FOLLOW_SYMLINKS) if(CONFIG_SPIFFS_FOLLOW_SYMLINKS)
set(follow_symlinks "--follow-symlinks") set(follow_symlinks "--follow-symlinks")
endif() endif()
# Execute SPIFFS image generation; this always executes as there is no way to specify for CMake to watch for # Execute SPIFFS image generation; this always executes as there is no way to specify for CMake to watch for
# contents of the base dir changing. # contents of the base dir changing.
add_custom_target(spiffs_${partition}_bin ALL add_custom_target(spiffs_${partition}_bin ALL
COMMAND ${spiffsgen_py} ${size} ${base_dir_full_path} ${image_file} COMMAND ${spiffsgen_py} ${size} ${base_dir_full_path} ${image_file}
--page-size=${CONFIG_SPIFFS_PAGE_SIZE} --page-size=${CONFIG_SPIFFS_PAGE_SIZE}
--obj-name-len=${CONFIG_SPIFFS_OBJ_NAME_LEN} --obj-name-len=${CONFIG_SPIFFS_OBJ_NAME_LEN}
--meta-len=${CONFIG_SPIFFS_META_LENGTH} --meta-len=${CONFIG_SPIFFS_META_LENGTH}
${follow_symlinks} ${follow_symlinks}
${use_magic} ${use_magic}
${use_magic_len} ${use_magic_len}
DEPENDS ${arg_DEPENDS} DEPENDS ${arg_DEPENDS}
) )
set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ADDITIONAL_MAKE_CLEAN_FILES
${image_file}) ${image_file})
if(arg_FLASH_IN_PROJECT) if(arg_FLASH_IN_PROJECT)
esptool_py_flash_project_args(${partition} ${offset} ${image_file} FLASH_IN_PROJECT) esptool_py_flash_project_args("${partition}" "${offset}" "${image_file}" FLASH_IN_PROJECT)
else()
esptool_py_flash_project_args("${partition}" "${offset}" "${image_file}")
endif()
else() else()
esptool_py_flash_project_args(${partition} ${offset} ${image_file}) set(message "Failed to create SPIFFS image for partition '${partition}'. "
"Check project configuration if using the correct partition table file.")
fail_at_build_time(spiffs_${partition}_bin "${message}")
endif() endif()
endfunction() endfunction()