alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/add_bootloader_sector_pad_option_v4.4' into 'release/v4.4'

Browse Source 
esptool_py: Added a --pad-to-size flag to align the bootloader image (v4.4)

See merge request espressif/esp-idf!22327
This commit is contained in:
Roland Dobai 2023-02-20 19:43:45 +08:00
commit 4199164ca1
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esptool_py/esptool

@ -1 +1 @@
Subproject commit 7d10144efdb14eb339a9e7ab59694f03d70e0eb9
Subproject commit 4bc311767b7c6df41def6f95a50f87b1c9406cbd

11
components/esptool_py/project_include.cmake
View File

@ -37,6 +37,17 @@ set(ESPTOOLPY_FLASH_OPTIONS
--flash_size ${ESPFLASHSIZE}
)
if(BOOTLOADER_BUILD AND CONFIG_SECURE_BOOT_V2_ENABLED)
# The bootloader binary needs to be 4KB aligned in order to append a secure boot V2 signature block.
# If CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES is NOT set, the bootloader
# image generated is not 4KB aligned for external HSM to sign it readily.
# Following esptool option --pad-to-size 4KB generates a 4K aligned bootloader image.
# In case of signing during build, espsecure.py "sign_data" operation handles the 4K alignment of the image.
if(NOT CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES)
list(APPEND esptool_elf2image_args --pad-to-size 4KB)
endif()
endif()
if(NOT BOOTLOADER_BUILD)
set(esptool_elf2image_args --elf-sha256-offset 0xb0)
endif()