Skip to content

Commit

Permalink
After #27010, it looks like merged_hex_to_flash is set and is still l…
Browse files Browse the repository at this point in the history
…ocated under zephyr (#27125)
  • Loading branch information
andy31415 authored and pull[bot] committed Apr 26, 2024
1 parent 585cd6a commit 8383869
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config/nrfconnect/app/flashing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ add_custom_command(OUTPUT "${FLASHBUNDLE_FLASHER_PLATFORM}"
VERBATIM)

if (merged_hex_to_flash)
set(flashbundle_hex_to_copy "${merged_hex_to_flash}")
set(flashbundle_hex_to_copy "zephyr/${merged_hex_to_flash}")
else()
set(flashbundle_hex_to_copy "zephyr/${KERNEL_HEX_NAME}")
endif()
Expand Down

0 comments on commit 8383869

Please sign in to comment.