diff --git a/drivers/flash/Kconfig.nrf_mramc b/drivers/flash/Kconfig.nrf_mramc index 1637baec896..d968b869c49 100644 --- a/drivers/flash/Kconfig.nrf_mramc +++ b/drivers/flash/Kconfig.nrf_mramc @@ -7,6 +7,7 @@ config SOC_FLASH_NRF_MRAMC bool "Nordic Semiconductor flash driver for MRAM using MRAM Controller" default y + depends on !BUILD_WITH_TFM depends on DT_HAS_NORDIC_NRF_MRAMC_ENABLED select NRFX_MRAMC select FLASH_HAS_DRIVER_ENABLED diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm index e28c087736e..a62ef049d2d 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm +++ b/modules/trusted-firmware-m/Kconfig.tfm @@ -35,6 +35,7 @@ config TFM_BOARD default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf54l10_cpuapp" if SOC_NRF54L10_CPUAPP default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf54lm20a_cpuapp" if SOC_NRF54LM20A_ENGA_CPUAPP + default "$(ZEPHYR_BASE)/modules/trusted-firmware-m/nordic/nrf7120_cpuapp" if SOC_NRF7120_ENGA_CPUAPP help The board name used for building TFM. Building with TFM requires that TFM has been ported to the given board/SoC. diff --git a/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h b/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h index 2b50abc57ae..4e74f537c7d 100644 --- a/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h +++ b/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h @@ -37,6 +37,8 @@ extern "C" { #include #elif defined(NRF54L_SERIES) #include +#elif defined(NRF71_SERIES) + #include #else #error "Unknown device." #endif diff --git a/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/CMakeLists.txt new file mode 100644 index 00000000000..89d36e5a4c7 --- /dev/null +++ b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/CMakeLists.txt @@ -0,0 +1,22 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: Apache-2.0 +# + +set(NRF_BOARD_SELECTED True) + +add_subdirectory(${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/common/nrf7120 nrf7120) + +add_subdirectory(.. common) + +install(FILES ${CMAKE_CURRENT_LIST_DIR}/ns/cpuarch_ns.cmake + DESTINATION ${INSTALL_PLATFORM_NS_DIR} + RENAME cpuarch.cmake) + +install(FILES config.cmake + DESTINATION ${INSTALL_PLATFORM_NS_DIR}) + +install(DIRECTORY ${Trusted\ Firmware\ M_SOURCE_DIR}/platform/ext/target/nordic_nrf/nrf7120dk_nrf7120_cpuapp/tests + DESTINATION ${INSTALL_PLATFORM_NS_DIR} +) diff --git a/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/config.cmake b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/config.cmake new file mode 100644 index 00000000000..c325c6d6539 --- /dev/null +++ b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/config.cmake @@ -0,0 +1,9 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: Apache-2.0 +# + +set(NRF_SOC_VARIANT nrf7120 CACHE STRING "nRF SoC Variant") + +include(${PLATFORM_PATH}/common/nrf7120/config.cmake) diff --git a/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/cpuarch.cmake new file mode 100644 index 00000000000..53be5a39816 --- /dev/null +++ b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/cpuarch.cmake @@ -0,0 +1,9 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: Apache-2.0 +# + +set(PLATFORM_PATH platform/ext/target/nordic_nrf) + +include(${PLATFORM_PATH}/common/nrf7120/cpuarch.cmake) diff --git a/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/ns/cpuarch_ns.cmake new file mode 100644 index 00000000000..54810b354eb --- /dev/null +++ b/modules/trusted-firmware-m/nordic/nrf7120_cpuapp/ns/cpuarch_ns.cmake @@ -0,0 +1,10 @@ +# +# Copyright (c) 2025, Nordic Semiconductor ASA. +# +# SPDX-License-Identifier: Apache-2.0 +# + +set(PLATFORM_DIR ${CMAKE_CURRENT_LIST_DIR}) +set(PLATFORM_PATH ${CMAKE_CURRENT_LIST_DIR}) + +include(${CMAKE_CURRENT_LIST_DIR}/common/nrf7120/cpuarch.cmake)