From 754d6312473668f2cc98a69594f127299fb12d7b Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Sun, 31 May 2020 18:39:30 +0200 Subject: [PATCH] partition_table: fix generation of signed partition table Fixes the issue that signed partition table was not generated when CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES was on, because partition_table_bin depended on unsigned_partition_bin twice. Regression from acb7a211. Also use final_partition_bin variable in esptool_py_flash_target_image arguments, to avoid issues in the future if final_partition_bin is changed. --- components/partition_table/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/partition_table/CMakeLists.txt b/components/partition_table/CMakeLists.txt index 2b78a1f22..ec00f222a 100644 --- a/components/partition_table/CMakeLists.txt +++ b/components/partition_table/CMakeLists.txt @@ -51,7 +51,7 @@ add_custom_command(OUTPUT "${build_dir}/partition_table/${unsigned_partition_bin VERBATIM) add_custom_target(partition_table_bin DEPENDS "${build_dir}/partition_table/${unsigned_partition_bin}" - "${build_dir}/partition_table/${unsigned_partition_bin}") + "${build_dir}/partition_table/${final_partition_bin}") if(EXISTS ${partition_csv}) add_custom_target(partition_table @@ -100,7 +100,7 @@ idf_component_get_property(sub_args esptool_py FLASH_SUB_ARGS) if(CONFIG_APP_BUILD_GENERATE_BINARIES) esptool_py_flash_target(partition_table-flash "${main_args}" "${sub_args}") esptool_py_flash_target_image(partition_table-flash partition_table "${PARTITION_TABLE_OFFSET}" - "${build_dir}/partition_table/partition-table.bin") + "${build_dir}/partition_table/${final_partition_bin}") esptool_py_flash_target_image(flash partition_table "${PARTITION_TABLE_OFFSET}" - "${build_dir}/partition_table/partition-table.bin") + "${build_dir}/partition_table/${final_partition_bin}") endif()