diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index 2ca875c4df2..a9a23d833c5 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/modules/trusted-firmware-m/CMakeLists.txt @@ -201,7 +201,7 @@ if (CONFIG_BUILD_WITH_TFM) ${TFM_INTERFACE_SOURCE_DIR}/tfm_ps_api.c ${TFM_INTERFACE_SOURCE_DIR}/tfm_tz_psa_ns_api.c - # Specific to nordic_nrf platform + # Specific to nordic platform ${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c ) diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm index fc442de2232..1cc4ec814e6 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm +++ b/modules/trusted-firmware-m/Kconfig.tfm @@ -17,9 +17,9 @@ config TFM_BOARD default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK default "arm/musca_b1" if BOARD_V2M_MUSCA_B1 default "arm/musca_s1" if BOARD_V2M_MUSCA_S1 - default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf9160" if SOC_NRF9160 - default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf9120" if SOC_NRF9120 - default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP + default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9160" if SOC_NRF9160 + default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf9120" if SOC_NRF9120 + default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic/nrf5340_cpuapp" if SOC_NRF5340_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_nrf/CMakeLists.txt b/modules/trusted-firmware-m/nordic/CMakeLists.txt similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt rename to modules/trusted-firmware-m/nordic/CMakeLists.txt diff --git a/modules/trusted-firmware-m/nordic_nrf/include/RTE_Device.h b/modules/trusted-firmware-m/nordic/include/RTE_Device.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/RTE_Device.h rename to modules/trusted-firmware-m/nordic/include/RTE_Device.h diff --git a/modules/trusted-firmware-m/nordic_nrf/include/device_cfg.h b/modules/trusted-firmware-m/nordic/include/device_cfg.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/device_cfg.h rename to modules/trusted-firmware-m/nordic/include/device_cfg.h diff --git a/modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h b/modules/trusted-firmware-m/nordic/include/tfm_ioctl_api.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h rename to modules/trusted-firmware-m/nordic/include/tfm_ioctl_api.h diff --git a/modules/trusted-firmware-m/nordic_nrf/include/tfm_peripherals_config.h b/modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/tfm_peripherals_config.h rename to modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h diff --git a/modules/trusted-firmware-m/nordic_nrf/include/tfm_read_ranges.h b/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/tfm_read_ranges.h rename to modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h diff --git a/modules/trusted-firmware-m/nordic_nrf/include/util/array.h b/modules/trusted-firmware-m/nordic/include/util/array.h similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/include/util/array.h rename to modules/trusted-firmware-m/nordic/include/util/array.h diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf5340_cpuapp/CMakeLists.txt similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/CMakeLists.txt rename to modules/trusted-firmware-m/nordic/nrf5340_cpuapp/CMakeLists.txt diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/config.cmake b/modules/trusted-firmware-m/nordic/nrf5340_cpuapp/config.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/config.cmake rename to modules/trusted-firmware-m/nordic/nrf5340_cpuapp/config.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf5340_cpuapp/cpuarch.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/cpuarch.cmake rename to modules/trusted-firmware-m/nordic/nrf5340_cpuapp/cpuarch.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf5340_cpuapp/ns/cpuarch_ns.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/ns/cpuarch_ns.cmake rename to modules/trusted-firmware-m/nordic/nrf5340_cpuapp/ns/cpuarch_ns.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf9120/CMakeLists.txt similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9120/CMakeLists.txt rename to modules/trusted-firmware-m/nordic/nrf9120/CMakeLists.txt diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/config.cmake b/modules/trusted-firmware-m/nordic/nrf9120/config.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9120/config.cmake rename to modules/trusted-firmware-m/nordic/nrf9120/config.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf9120/cpuarch.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9120/cpuarch.cmake rename to modules/trusted-firmware-m/nordic/nrf9120/cpuarch.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9120/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf9120/ns/cpuarch_ns.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9120/ns/cpuarch_ns.cmake rename to modules/trusted-firmware-m/nordic/nrf9120/ns/cpuarch_ns.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/CMakeLists.txt b/modules/trusted-firmware-m/nordic/nrf9160/CMakeLists.txt similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9160/CMakeLists.txt rename to modules/trusted-firmware-m/nordic/nrf9160/CMakeLists.txt diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/config.cmake b/modules/trusted-firmware-m/nordic/nrf9160/config.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9160/config.cmake rename to modules/trusted-firmware-m/nordic/nrf9160/config.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/cpuarch.cmake b/modules/trusted-firmware-m/nordic/nrf9160/cpuarch.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9160/cpuarch.cmake rename to modules/trusted-firmware-m/nordic/nrf9160/cpuarch.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/nrf9160/ns/cpuarch_ns.cmake b/modules/trusted-firmware-m/nordic/nrf9160/ns/cpuarch_ns.cmake similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/nrf9160/ns/cpuarch_ns.cmake rename to modules/trusted-firmware-m/nordic/nrf9160/ns/cpuarch_ns.cmake diff --git a/modules/trusted-firmware-m/nordic_nrf/ns/CMakeLists.txt b/modules/trusted-firmware-m/nordic/ns/CMakeLists.txt similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/ns/CMakeLists.txt rename to modules/trusted-firmware-m/nordic/ns/CMakeLists.txt diff --git a/modules/trusted-firmware-m/nordic_nrf/src/tfm_hal_platform.c b/modules/trusted-firmware-m/nordic/src/tfm_hal_platform.c similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/src/tfm_hal_platform.c rename to modules/trusted-firmware-m/nordic/src/tfm_hal_platform.c diff --git a/modules/trusted-firmware-m/nordic_nrf/src/tfm_platform_system.c b/modules/trusted-firmware-m/nordic/src/tfm_platform_system.c similarity index 100% rename from modules/trusted-firmware-m/nordic_nrf/src/tfm_platform_system.c rename to modules/trusted-firmware-m/nordic/src/tfm_platform_system.c