Skip to content
Commit b39384f5 authored by Sebastian Bøe's avatar Sebastian Bøe Committed by Carles Cufí
Browse files

tf-m: Fix flashing of samples on nrf5340 and nrf9160 boards



Always flash the merged hex file.

This fixes flashing for samples. Before "west flash" only worked for
tests.

I don't know why this was not done from the get-go.

This also fixes builds that enables CONFIG_TFM_REGRESSION_NS, which will
use the tfm_ns application file instead of the zephyr application, and
will merge tfm_ns hex into the merged hex file. Otherwise the wrong
application hex file will be flashed.

Signed-off-by: default avatarSebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: default avatarJoakim Andersson <joakim.andersson@nordicsemi.no>
parent 12decc70
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment