Merge branch 'master' into AddingWasherControlsXML

project-chip · Jun 7, 2023 · 9b2b1d9 · 9b2b1d9
2 parents a28ee9b + 88f02e6
commit 9b2b1d9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/config/nrfconnect/app/flashing.cmake b/config/nrfconnect/app/flashing.cmake
@@ -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()