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

Tools: Fix esptool arguments and use flash size detection if selected

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/8798
This commit is contained in:
Roland Dobai
2022-05-13 16:39:57 +02:00
parent 8094d874bc
commit 9bbbb99907
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esptool_py/project_include.cmake
View File

@@ -26,7 +26,7 @@ set(ESPFLASHSIZE ${CONFIG_ESPTOOLPY_FLASHSIZE})
set(ESPTOOLPY_CHIP "${chip_model}") set(ESPTOOLPY_CHIP "${chip_model}")
set(ESPTOOLPY_FLASH_OPTIONS set(ELF2IMAGE_FLASH_OPTIONS
--flash_mode ${ESPFLASHMODE} --flash_mode ${ESPFLASHMODE}
--flash_freq ${ESPFLASHFREQ} --flash_freq ${ESPFLASHFREQ}
--flash_size ${ESPFLASHSIZE} --flash_size ${ESPFLASHSIZE}
@@ -59,7 +59,7 @@ if(min_rev)
endif() 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_FLASH_OPTIONS are generated,
# as elf2image can't have 'detect' as an option... # as elf2image can't have 'detect' as an option...
set(ESPFLASHSIZE detect) set(ESPFLASHSIZE detect)
endif() endif()
@@ -87,7 +87,7 @@ set(PROJECT_BIN "${elf_name}.bin")
# #
if(CONFIG_APP_BUILD_GENERATE_BINARIES) if(CONFIG_APP_BUILD_GENERATE_BINARIES)
add_custom_command(OUTPUT "${build_dir}/.bin_timestamp" add_custom_command(OUTPUT "${build_dir}/.bin_timestamp"
COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_FLASH_OPTIONS} ${esptool_elf2image_args} COMMAND ${ESPTOOLPY} elf2image ${ELF2IMAGE_FLASH_OPTIONS} ${esptool_elf2image_args}
-o "${build_dir}/${unsigned_project_binary}" "${elf_dir}/${elf}" -o "${build_dir}/${unsigned_project_binary}" "${elf_dir}/${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"
@@ -183,7 +183,8 @@ if(CONFIG_ESPTOOLPY_NO_STUB)
endif() endif()
idf_component_set_property(esptool_py FLASH_ARGS "${esptool_flash_main_args}") idf_component_set_property(esptool_py FLASH_ARGS "${esptool_flash_main_args}")
idf_component_set_property(esptool_py FLASH_SUB_ARGS "${ESPTOOLPY_FLASH_OPTIONS}") idf_component_set_property(esptool_py FLASH_SUB_ARGS "--flash_mode ${ESPFLASHMODE} --flash_freq ${ESPFLASHFREQ} \
--flash_size ${ESPFLASHSIZE}")
function(esptool_py_partition_needs_encryption retencrypted partition_name) function(esptool_py_partition_needs_encryption retencrypted partition_name)
# Check if encryption is enabled # Check if encryption is enabled