Skip to content

Commit 52e2f17

Browse files
Merge branch 'fix/bootloader_add_custom_command_incorrect' into 'master'
fix(bootloader): Correct add_custom_command 'DEPENDS' usage See merge request espressif/esp-idf!40510
2 parents a5d53fc + 69702d8 commit 52e2f17

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

components/bootloader/subproject/CMakeLists.txt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ if(CONFIG_SECURE_BOOT_V2_ENABLED)
194194
endif()
195195

196196
if(CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
197-
add_custom_command(TARGET bootloader.elf POST_BUILD
197+
add_custom_command(TARGET gen_project_binary POST_BUILD
198198
COMMAND ${CMAKE_COMMAND} -E echo
199199
"=============================================================================="
200200
COMMAND ${CMAKE_COMMAND} -E echo
@@ -207,7 +207,7 @@ if(CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
207207
"* IMPORTANT: After first boot, BOOTLOADER CANNOT BE RE-FLASHED on same device"
208208
VERBATIM)
209209
elseif(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
210-
add_custom_command(TARGET bootloader.elf POST_BUILD
210+
add_custom_command(TARGET gen_bootloader_digest_bin POST_BUILD
211211
COMMAND ${CMAKE_COMMAND} -E echo
212212
"=============================================================================="
213213
COMMAND ${CMAKE_COMMAND} -E echo
@@ -234,14 +234,13 @@ elseif(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
234234
"* After first boot, only re-flashes of this kind (with same key) will be accepted."
235235
COMMAND ${CMAKE_COMMAND} -E echo
236236
"* Not recommended to reuse the same secure boot keyfile on multiple production devices."
237-
DEPENDS gen_secure_bootloader_key gen_bootloader_digest_bin
238237
VERBATIM)
239238
elseif(
240239
CONFIG_SECURE_BOOT_V2_ENABLED AND
241240
(CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS GREATER 1) AND
242241
NOT CONFIG_SECURE_BOOT_FLASH_BOOTLOADER_DEFAULT
243242
)
244-
add_custom_command(TARGET bootloader.elf POST_BUILD
243+
add_custom_command(TARGET gen_signed_bootloader POST_BUILD
245244
COMMAND ${CMAKE_COMMAND} -E echo
246245
"=============================================================================="
247246
COMMAND ${CMAKE_COMMAND} -E echo
@@ -257,21 +256,17 @@ elseif(
257256
"\t${esptoolpy_write_flash} ${BOOTLOADER_OFFSET} ${CMAKE_BINARY_DIR}/bootloader.bin"
258257
COMMAND ${CMAKE_COMMAND} -E echo
259258
"=============================================================================="
260-
DEPENDS gen_signed_bootloader
261259
VERBATIM)
262260
elseif(CONFIG_SECURE_BOOT_V2_ENABLED AND NOT CONFIG_SECURE_BOOT_FLASH_BOOTLOADER_DEFAULT)
263-
add_custom_command(TARGET bootloader.elf POST_BUILD
261+
add_custom_command(TARGET gen_signed_bootloader POST_BUILD
264262
COMMAND ${CMAKE_COMMAND} -E echo
265263
"=============================================================================="
266264
COMMAND ${CMAKE_COMMAND} -E echo
267265
"Bootloader built. Secure boot enabled, so bootloader not flashed automatically."
268-
COMMAND ${CMAKE_COMMAND} -E echo
269-
"Secure boot enabled, so bootloader not flashed automatically."
270266
COMMAND ${CMAKE_COMMAND} -E echo
271267
"\t${esptoolpy_write_flash} ${BOOTLOADER_OFFSET} ${CMAKE_BINARY_DIR}/bootloader.bin"
272268
COMMAND ${CMAKE_COMMAND} -E echo
273269
"=============================================================================="
274-
DEPENDS gen_signed_bootloader
275270
VERBATIM)
276271
endif()
277272

0 commit comments

Comments
 (0)