From 5b08c938521b2fd6e480c219c3bb6a72151433fa Mon Sep 17 00:00:00 2001 From: Konstantin Kondrashov Date: Mon, 9 Sep 2024 15:25:53 +0300 Subject: [PATCH] fix(esptool_py): Check the size of the bootloader + signature block --- components/esptool_py/CMakeLists.txt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/components/esptool_py/CMakeLists.txt b/components/esptool_py/CMakeLists.txt index 1497be79f5..ff2adc7d5c 100644 --- a/components/esptool_py/CMakeLists.txt +++ b/components/esptool_py/CMakeLists.txt @@ -60,10 +60,19 @@ consist of two ota app without factory or test partitions.") endif() # NOT BOOTLOADER_BUILD if(BOOTLOADER_BUILD) - # Generate bootloader post-build check of the bootloader size against the offset - partition_table_add_check_bootloader_size_target(bootloader_check_size - DEPENDS gen_project_binary - BOOTLOADER_BINARY_PATH "${build_dir}/${PROJECT_BIN}" - RESULT bootloader_check_size_command) - add_dependencies(app bootloader_check_size) # note: in the subproject, so the target is 'app'... + # Generate bootloader post-build check of the bootloader size against the offset + partition_table_add_check_bootloader_size_target(bootloader_check_size + DEPENDS gen_project_binary + BOOTLOADER_BINARY_PATH "${build_dir}/${PROJECT_BIN}" + RESULT bootloader_check_size_command) + add_dependencies(app bootloader_check_size) # note: in the subproject, so the target is 'app'... + + if(CONFIG_SECURE_BOOT_V2_ENABLED AND CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES) + # Check the size of the bootloader + signature block. + partition_table_add_check_bootloader_size_target(bootloader_check_size_signed + DEPENDS gen_signed_bootloader + BOOTLOADER_BINARY_PATH "${build_dir}/${PROJECT_BIN}" + RESULT bootloader_check_size_signed_command) + add_dependencies(app bootloader_check_size_signed) # note: in the subproject, so the target is 'app'... + endif() endif()