Browse Source

modules: tf-m: Rename from nordic_nrf to nordic

Aligns with the vendor prefix

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
pull/69687/head
Jamie McCrae 1 year ago committed by Carles Cufi
parent
commit
e25730ba56
  1. 2
      modules/trusted-firmware-m/CMakeLists.txt
  2. 6
      modules/trusted-firmware-m/Kconfig.tfm
  3. 0
      modules/trusted-firmware-m/nordic/CMakeLists.txt
  4. 0
      modules/trusted-firmware-m/nordic/include/RTE_Device.h
  5. 0
      modules/trusted-firmware-m/nordic/include/device_cfg.h
  6. 0
      modules/trusted-firmware-m/nordic/include/tfm_ioctl_api.h
  7. 0
      modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h
  8. 0
      modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h
  9. 0
      modules/trusted-firmware-m/nordic/include/util/array.h
  10. 0
      modules/trusted-firmware-m/nordic/nrf5340_cpuapp/CMakeLists.txt
  11. 0
      modules/trusted-firmware-m/nordic/nrf5340_cpuapp/config.cmake
  12. 0
      modules/trusted-firmware-m/nordic/nrf5340_cpuapp/cpuarch.cmake
  13. 0
      modules/trusted-firmware-m/nordic/nrf5340_cpuapp/ns/cpuarch_ns.cmake
  14. 0
      modules/trusted-firmware-m/nordic/nrf9120/CMakeLists.txt
  15. 0
      modules/trusted-firmware-m/nordic/nrf9120/config.cmake
  16. 0
      modules/trusted-firmware-m/nordic/nrf9120/cpuarch.cmake
  17. 0
      modules/trusted-firmware-m/nordic/nrf9120/ns/cpuarch_ns.cmake
  18. 0
      modules/trusted-firmware-m/nordic/nrf9160/CMakeLists.txt
  19. 0
      modules/trusted-firmware-m/nordic/nrf9160/config.cmake
  20. 0
      modules/trusted-firmware-m/nordic/nrf9160/cpuarch.cmake
  21. 0
      modules/trusted-firmware-m/nordic/nrf9160/ns/cpuarch_ns.cmake
  22. 0
      modules/trusted-firmware-m/nordic/ns/CMakeLists.txt
  23. 0
      modules/trusted-firmware-m/nordic/src/tfm_hal_platform.c
  24. 0
      modules/trusted-firmware-m/nordic/src/tfm_platform_system.c

2
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_ps_api.c
${TFM_INTERFACE_SOURCE_DIR}/tfm_tz_psa_ns_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 ${TFM_INTERFACE_SOURCE_DIR}/tfm_ioctl_core_ns_api.c
) )

6
modules/trusted-firmware-m/Kconfig.tfm

@ -17,9 +17,9 @@ config TFM_BOARD
default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK
default "arm/musca_b1" if BOARD_V2M_MUSCA_B1 default "arm/musca_b1" if BOARD_V2M_MUSCA_B1
default "arm/musca_s1" if BOARD_V2M_MUSCA_S1 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/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/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/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
help help
The board name used for building TFM. Building with TFM requires that The board name used for building TFM. Building with TFM requires that
TFM has been ported to the given board/SoC. TFM has been ported to the given board/SoC.

0
modules/trusted-firmware-m/nordic_nrf/CMakeLists.txt → modules/trusted-firmware-m/nordic/CMakeLists.txt

0
modules/trusted-firmware-m/nordic_nrf/include/RTE_Device.h → modules/trusted-firmware-m/nordic/include/RTE_Device.h

0
modules/trusted-firmware-m/nordic_nrf/include/device_cfg.h → modules/trusted-firmware-m/nordic/include/device_cfg.h

0
modules/trusted-firmware-m/nordic_nrf/include/tfm_ioctl_api.h → modules/trusted-firmware-m/nordic/include/tfm_ioctl_api.h

0
modules/trusted-firmware-m/nordic_nrf/include/tfm_peripherals_config.h → modules/trusted-firmware-m/nordic/include/tfm_peripherals_config.h

0
modules/trusted-firmware-m/nordic_nrf/include/tfm_read_ranges.h → modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h

0
modules/trusted-firmware-m/nordic_nrf/include/util/array.h → modules/trusted-firmware-m/nordic/include/util/array.h

0
modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/CMakeLists.txt → modules/trusted-firmware-m/nordic/nrf5340_cpuapp/CMakeLists.txt

0
modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/config.cmake → modules/trusted-firmware-m/nordic/nrf5340_cpuapp/config.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/cpuarch.cmake → modules/trusted-firmware-m/nordic/nrf5340_cpuapp/cpuarch.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp/ns/cpuarch_ns.cmake → modules/trusted-firmware-m/nordic/nrf5340_cpuapp/ns/cpuarch_ns.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9120/CMakeLists.txt → modules/trusted-firmware-m/nordic/nrf9120/CMakeLists.txt

0
modules/trusted-firmware-m/nordic_nrf/nrf9120/config.cmake → modules/trusted-firmware-m/nordic/nrf9120/config.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9120/cpuarch.cmake → modules/trusted-firmware-m/nordic/nrf9120/cpuarch.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9120/ns/cpuarch_ns.cmake → modules/trusted-firmware-m/nordic/nrf9120/ns/cpuarch_ns.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9160/CMakeLists.txt → modules/trusted-firmware-m/nordic/nrf9160/CMakeLists.txt

0
modules/trusted-firmware-m/nordic_nrf/nrf9160/config.cmake → modules/trusted-firmware-m/nordic/nrf9160/config.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9160/cpuarch.cmake → modules/trusted-firmware-m/nordic/nrf9160/cpuarch.cmake

0
modules/trusted-firmware-m/nordic_nrf/nrf9160/ns/cpuarch_ns.cmake → modules/trusted-firmware-m/nordic/nrf9160/ns/cpuarch_ns.cmake

0
modules/trusted-firmware-m/nordic_nrf/ns/CMakeLists.txt → modules/trusted-firmware-m/nordic/ns/CMakeLists.txt

0
modules/trusted-firmware-m/nordic_nrf/src/tfm_hal_platform.c → modules/trusted-firmware-m/nordic/src/tfm_hal_platform.c

0
modules/trusted-firmware-m/nordic_nrf/src/tfm_platform_system.c → modules/trusted-firmware-m/nordic/src/tfm_platform_system.c

Loading…
Cancel
Save