boards: mps4: Enable non-secure variant support

Zephyr's TF-M has been aligned with upstream TF-M v2.2.0, which adds
support for Corstone-320 (CS320). The previous commit also updates TF-M
to fix compiler warnings seen with MPS4. So, with this update, enable
build and execution of non-secure variants of MPS4-based boards.

Signed-off-by: Sudan Landge <sudan.landge@arm.com>

Author: wearyzen

boards/arm/mps4/board.cmake

@@ -33,7 +33,16 @@ if(CONFIG_ARM_PAC OR CONFIG_ARM_BTI)
 endif()
 
 if(CONFIG_BUILD_WITH_TFM)
-  set(ARMFVP_FLAGS ${ARMFVP_FLAGS} -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex)
+  # Workaround: Use binary (.bin) format images until TF-M supports generating them in hex (.hex)
+  # format. The image load addresses are referred from the TF-M official documentation at:
+  # https://trustedfirmware-m.readthedocs.io/en/latest/platform/arm/mps4/corstone320/README.html
+  set(ARMFVP_FLAGS ${ARMFVP_FLAGS}
+    --data ${APPLICATION_BINARY_DIR}/tfm/bin/bl1_1.bin@0x11000000
+    --data ${APPLICATION_BINARY_DIR}/tfm/bin/cm_provisioning_bundle.bin@0x12024000
+    --data ${APPLICATION_BINARY_DIR}/tfm/bin/dm_provisioning_bundle.bin@0x1202aa00
+    --data ${APPLICATION_BINARY_DIR}/tfm/bin/bl2_signed.bin@0x12031400
+    -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex
+  )
 endif()
 
 # FVP Parameters

boards/arm/mps4/mps4_corstone315_fvp_ns.yaml

@@ -7,6 +7,9 @@ type: mcu
 arch: arm
 ram: 1024
 flash: 512
+simulation:
+  - name: armfvp
+    exec: FVP_Corstone_SSE-315
 toolchain:
   - gnuarmemb
   - zephyr

boards/arm/mps4/mps4_corstone320_fvp_ns.yaml

@@ -7,6 +7,9 @@ type: mcu
 arch: arm
 ram: 1024
 flash: 512
+simulation:
+  - name: armfvp
+    exec: FVP_Corstone_SSE-320
 toolchain:
   - gnuarmemb
   - zephyr

modules/trusted-firmware-m/Kconfig.tfm

@@ -12,11 +12,13 @@ config TFM_BOARD
 	string
 	default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_LPC55S69_CPU0_NS
 	default "arm/mps2/an521" if BOARD_MPS2_AN521_CPU0_NS
-	default "arm/mps3/corstone300/fvp"   if BOARD_MPS3_CORSTONE300_FVP_NS
+	default "arm/mps3/corstone300/fvp" if BOARD_MPS3_CORSTONE300_FVP_NS
 	default "arm/mps3/corstone300/an547" if BOARD_MPS3_CORSTONE300_AN547_NS
 	default "arm/mps3/corstone300/an552" if BOARD_MPS3_CORSTONE300_AN552_NS
 	default "arm/mps3/corstone310/an555" if BOARD_MPS3_CORSTONE310_AN555_NS
-	default "arm/mps3/corstone310/fvp"   if BOARD_MPS3_CORSTONE310_FVP_NS
+	default "arm/mps3/corstone310/fvp" if BOARD_MPS3_CORSTONE310_FVP_NS
+	default "arm/mps4/corstone315" if BOARD_MPS4_CORSTONE315_FVP_NS
+	default "arm/mps4/corstone320" if BOARD_MPS4_CORSTONE320_FVP_NS
 	default "stm/b_u585i_iot02a" if BOARD_B_U585I_IOT02A
 	default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q
 	default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK