esptool_py: fix issue with variable for esptool args
elf2image-only arguments are being added to esptool args meant for flashing
This commit is contained in:
parent
2adf313838
commit
6a18eaeaf5
|
@ -1,6 +1,6 @@
|
||||||
idf_component_register(REQUIRES bootloader)
|
idf_component_register(REQUIRES bootloader)
|
||||||
|
|
||||||
string(REPLACE ";" " " ESPTOOLPY_FLASH_PROJECT_OPTIONS "${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS}")
|
string(REPLACE ";" " " ESPTOOLPY_FLASH_PROJECT_OPTIONS "${ESPTOOLPY_FLASH_OPTIONS}")
|
||||||
set(ESPTOOLPY_FLASH_PROJECT_OPTIONS
|
set(ESPTOOLPY_FLASH_PROJECT_OPTIONS
|
||||||
"${ESPTOOLPY_FLASH_PROJECT_OPTIONS}"
|
"${ESPTOOLPY_FLASH_PROJECT_OPTIONS}"
|
||||||
)
|
)
|
||||||
|
|
|
@ -31,7 +31,7 @@ else()
|
||||||
set(ESPTOOLPY_COMPRESSED_OPT -u)
|
set(ESPTOOLPY_COMPRESSED_OPT -u)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS
|
set(ESPTOOLPY_FLASH_OPTIONS
|
||||||
--flash_mode ${ESPFLASHMODE}
|
--flash_mode ${ESPFLASHMODE}
|
||||||
--flash_freq ${ESPFLASHFREQ}
|
--flash_freq ${ESPFLASHFREQ}
|
||||||
--flash_size ${ESPFLASHSIZE}
|
--flash_size ${ESPFLASHSIZE}
|
||||||
|
@ -40,19 +40,18 @@ set(ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS
|
||||||
# String for printing flash command
|
# String for printing flash command
|
||||||
string(REPLACE ";" " " ESPTOOLPY_WRITE_FLASH_STR
|
string(REPLACE ";" " " ESPTOOLPY_WRITE_FLASH_STR
|
||||||
"${ESPTOOLPY} --port (PORT) --baud (BAUD) --before ${ESPTOOLPY_BEFORE} --after ${ESPTOOLPY_AFTER} "
|
"${ESPTOOLPY} --port (PORT) --baud (BAUD) --before ${ESPTOOLPY_BEFORE} --after ${ESPTOOLPY_AFTER} "
|
||||||
"write_flash ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} ${ESPTOOLPY_EXTRA_FLASH_OPTIONS} ${ESPTOOLPY_COMPRESSED_OPT}")
|
"write_flash ${ESPTOOLPY_FLASH_OPTIONS} ${ESPTOOLPY_EXTRA_FLASH_OPTIONS} ${ESPTOOLPY_COMPRESSED_OPT}")
|
||||||
|
|
||||||
if(CONFIG_SECURE_BOOT_ENABLED AND
|
|
||||||
NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION AND
|
|
||||||
NOT BOOTLOADER_BUILD)
|
|
||||||
set(ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS
|
|
||||||
${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} --secure-pad)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT BOOTLOADER_BUILD)
|
if(NOT BOOTLOADER_BUILD)
|
||||||
set(ESPTOOLPY_ELF2IMAGE_OPTIONS --elf-sha256-offset 0xb0)
|
set(ESPTOOLPY_ELF2IMAGE_OPTIONS --elf-sha256-offset 0xb0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(CONFIG_SECURE_BOOT_ENABLED AND
|
||||||
|
NOT CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION
|
||||||
|
AND NOT BOOTLOADER_BUILD)
|
||||||
|
set(ESPTOOLPY_ELF2IMAGE_OPTIONS ${ESPTOOLPY_ELF2IMAGE_OPTIONS} --secure-pad)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
|
if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
|
||||||
# Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,
|
# Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,
|
||||||
# as elf2image can't have 'detect' as an option...
|
# as elf2image can't have 'detect' as an option...
|
||||||
|
@ -76,7 +75,7 @@ set(PROJECT_BIN "${elf_name}.bin")
|
||||||
# Add 'app.bin' target - generates with elf2image
|
# Add 'app.bin' target - generates with elf2image
|
||||||
#
|
#
|
||||||
add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
|
add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
|
||||||
COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} ${ESPTOOLPY_ELF2IMAGE_OPTIONS}
|
COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_FLASH_OPTIONS} ${ESPTOOLPY_ELF2IMAGE_OPTIONS}
|
||||||
-o "${build_dir}/${unsigned_project_binary}" "${elf}"
|
-o "${build_dir}/${unsigned_project_binary}" "${elf}"
|
||||||
COMMAND ${CMAKE_COMMAND} -E echo "Generated ${build_dir}/${unsigned_project_binary}"
|
COMMAND ${CMAKE_COMMAND} -E echo "Generated ${build_dir}/${unsigned_project_binary}"
|
||||||
COMMAND ${CMAKE_COMMAND} -E md5sum "${build_dir}/${unsigned_project_binary}" > "${build_dir}/.bin_timestamp"
|
COMMAND ${CMAKE_COMMAND} -E md5sum "${build_dir}/${unsigned_project_binary}" > "${build_dir}/.bin_timestamp"
|
||||||
|
@ -87,6 +86,11 @@ add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
|
||||||
)
|
)
|
||||||
add_custom_target(gen_project_binary DEPENDS "${build_dir}/.bin_timestamp")
|
add_custom_target(gen_project_binary DEPENDS "${build_dir}/.bin_timestamp")
|
||||||
|
|
||||||
|
set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||||
|
APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
|
||||||
|
"${build_dir}/${unsigned_project_binary}"
|
||||||
|
)
|
||||||
|
|
||||||
if(NOT BOOTLOADER_BUILD AND
|
if(NOT BOOTLOADER_BUILD AND
|
||||||
CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
|
CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
|
||||||
|
|
||||||
|
@ -103,6 +107,11 @@ if(NOT BOOTLOADER_BUILD AND
|
||||||
)
|
)
|
||||||
add_custom_target(gen_signed_project_binary DEPENDS "${build_dir}/.signed_bin_timestamp")
|
add_custom_target(gen_signed_project_binary DEPENDS "${build_dir}/.signed_bin_timestamp")
|
||||||
add_dependencies(gen_project_binary gen_signed_project_binary)
|
add_dependencies(gen_project_binary gen_signed_project_binary)
|
||||||
|
|
||||||
|
set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||||
|
APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
|
||||||
|
"${build_dir}/${PROJECT_BIN}"
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT BOOTLOADER_BUILD)
|
if(NOT BOOTLOADER_BUILD)
|
||||||
|
|
Loading…
Reference in a new issue