boards: Run the combined an547 hex in qemu

Zephyr will try to run the `zephyr.elf` file by default. This is
problematic for any `..._ns` target, as they all need to boot through
[mcuboot and] TF-M. They simply hardfault without the rest of their
system image.

This corrects the `west build -t run ...` for the `mps3_an547_ns`
board, as it now has special treatment.

Signed-off-by: Jimmy Brisson <[email protected]>

Author: theotherjimmy

boards/arm/mps3_an547/board.cmake

@@ -21,6 +21,13 @@ set(QEMU_FLAGS_${ARCH}
   )
 board_set_debugger_ifnset(qemu)
 
+if (CONFIG_BUILD_WITH_TFM)
+  # Override the binary used by qemu, to use the combined
+  # TF-M (Secure) & Zephyr (Non Secure) image (when running
+  # in-tree tests).
+  set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/tfm_merged.hex")
+endif()
+
 # FVP settings
 set(ARMFVP_BIN_NAME FVP_Corstone_SSE-300_Ethos-U55)