boards: arm: update board definitions due to new TF-M build system

TF-M related information in the relevant board definitions needs to be updated in the wake of the new TF-M Build system. Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
ceolin · Oct 19, 2020 · c9fd62a · c9fd62a
1 parent 64ecac6
commit c9fd62a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/boards/arm/lpcxpresso55s69/board.cmake b/boards/arm/lpcxpresso55s69/board.cmake
@@ -20,4 +20,4 @@ board_runner_args(pyocd "--target=lpc55s69")
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 
-set(TFM_TARGET_PLATFORM "LPC55S69")
+set(TFM_TARGET_PLATFORM "nxp/lpcxpresso55s69")
diff --git a/boards/arm/mps2_an521/board.cmake b/boards/arm/mps2_an521/board.cmake
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 set(EMU_PLATFORM qemu)
-set(TFM_TARGET_PLATFORM "AN521")
+set(TFM_TARGET_PLATFORM "mps2/an521")
 
 set(QEMU_CPU_TYPE_${ARCH} cortex-m33)
 set(QEMU_FLAGS_${ARCH}

diff --git a/boards/arm/nucleo_l552ze_q/board.cmake b/boards/arm/nucleo_l552ze_q/board.cmake
@@ -6,4 +6,4 @@ board_runner_args(pyocd "--target=stm32l552zetxq")
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 
-set(TFM_TARGET_PLATFORM "STM_NUCLEO_L552ZE_Q")
+set(TFM_TARGET_PLATFORM "stm/nucleo_l552ze_q")
diff --git a/boards/arm/v2m_musca_b1/board.cmake b/boards/arm/v2m_musca_b1/board.cmake
@@ -1,6 +1,6 @@
 #SPDX-License-Identifier: Apache-2.0
 
-set(TFM_TARGET_PLATFORM "MUSCA_B1")
+set(TFM_TARGET_PLATFORM "musca_b1")
 
 board_set_debugger_ifnset(pyocd)
 board_set_flasher_ifnset(pyocd)

diff --git a/samples/tfm_integration/tfm_ipc/CMakeLists.txt b/samples/tfm_integration/tfm_ipc/CMakeLists.txt
@@ -14,7 +14,7 @@ elseif (CONFIG_TFM_BL2_FALSE)
 endif()
 
 # Add "tfm" as an external project via the TF-M module's cmake file
-if(${TFM_TARGET_PLATFORM} STREQUAL "STM_NUCLEO_L552ZE_Q")
+if(${TFM_TARGET_PLATFORM} STREQUAL "stm/nucleo_l552ze_q")
    trusted_firmware_build(BINARY_DIR ${CMAKE_BINARY_DIR}/tfm
                           BOARD ${TFM_TARGET_PLATFORM}
                           IPC