feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/otatool_targets' into 'master'

Browse Source 
app_update: Fix otatool targets

Closes IDF-4758 and IDFGH-7254

See merge request espressif/esp-idf!18190
This commit is contained in:
Roland Dobai
2022-05-24 15:47:34 +08:00
parent 5607018f28 457beeb530
commit 4e0116a170
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
components/app_update/CMakeLists.txt
View File

@@ -48,34 +48,37 @@ if(NOT BOOTLOADER_BUILD)
add_dependencies(flash blank_ota_data) add_dependencies(flash blank_ota_data)
add_dependencies(encrypted-flash blank_ota_data) add_dependencies(encrypted-flash blank_ota_data)
set(otatool_py ${python} ${COMPONENT_DIR}/otatool.py) set(otatool_py "${python}" "${COMPONENT_DIR}/otatool.py")
set(esptool_args --esptool-args before=${CONFIG_ESPTOOLPY_BEFORE} after=${CONFIG_ESPTOOLPY_AFTER})
set(otatool_args --partition-table-file ${PARTITION_CSV_PATH})
list(APPEND otatool_args --partition-table-offset ${PARTITION_TABLE_OFFSET})
set(esptool_args "--esptool-args;before=${CONFIG_ESPTOOLPY_BEFORE};after=${CONFIG_ESPTOOLPY_AFTER}")
set(otatool_args "--partition-table-file;${PARTITION_CSV_PATH}"
"--partition-table-offset;${PARTITION_TABLE_OFFSET}")
idf_component_get_property(esptool_py_dir esptool_py COMPONENT_DIR) idf_component_get_property(esptool_py_dir esptool_py COMPONENT_DIR)
add_custom_target(read-otadata DEPENDS "${PARTITION_CSV_PATH}" add_custom_target(read-otadata DEPENDS "${PARTITION_CSV_PATH}"
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D IDF_PATH="${idf_path}" -D "IDF_PATH=${idf_path}"
-D SERIAL_TOOL="${otatool_py}" -D "SERIAL_TOOL=${otatool_py}"
-D SERIAL_TOOL_ARGS="${esptool_args};${otatool_args};read_otadata" -D "SERIAL_TOOL_ARGS=${esptool_args};${otatool_args};read_otadata"
-D WORKING_DIRECTORY="${build_dir}" -D "WORKING_DIRECTORY=${build_dir}"
-P ${esptool_py_dir}/run_serial_tool.cmake -P ${esptool_py_dir}/run_serial_tool.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY "${build_dir}"
USES_TERMINAL USES_TERMINAL
VERBATIM
) )
add_deprecated_target_alias(read_otadata read-otadata) add_deprecated_target_alias(read_otadata read-otadata)
add_custom_target(erase-otadata DEPENDS "${PARTITION_CSV_PATH}" add_custom_target(erase-otadata DEPENDS "${PARTITION_CSV_PATH}"
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D IDF_PATH="${idf_path}" -D "IDF_PATH=${idf_path}"
-D SERIAL_TOOL="${otatool_py}" -D "SERIAL_TOOL=${otatool_py}"
-D SERIAL_TOOL_ARGS="${esptool_args};${otatool_args};erase_otadata" -D "SERIAL_TOOL_ARGS=${esptool_args};${otatool_args};erase_otadata"
-D WORKING_DIRECTORY="${build_dir}" -D "WORKING_DIRECTORY=${build_dir}"
-P ${esptool_py_dir}/run_serial_tool.cmake -P ${esptool_py_dir}/run_serial_tool.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY "${build_dir}"
USES_TERMINAL USES_TERMINAL
VERBATIM
) )
add_deprecated_target_alias(erase_otadata erase-otadata) add_deprecated_target_alias(erase_otadata erase-otadata)