aboutsummaryrefslogtreecommitdiff
path: root/platform/ext
diff options
context:
space:
mode:
authorSummer Qin <summer.qin@arm.com>2021-05-14 13:44:14 +0800
committerKarl Zhang <karl.zhang@arm.com>2021-06-04 09:49:14 +0200
commit2de23d0367b545016ad134965343e8d39ae535fe (patch)
tree5871f6ac2051da872047370fd00269f75de74ab2 /platform/ext
parentc4d8e2c5ab26706b510f35dac65354281bce7bb7 (diff)
downloadtrusted-firmware-m-2de23d0367b545016ad134965343e8d39ae535fe.tar.gz
Platform: Add arm folder for arm platforms
Put arm platforms into arm folder and remove some unused cryptocell-312-runtime. It will be convenient for users and developers. Signed-off-by: Summer Qin <summer.qin@arm.com> Change-Id: I1187a8f2b18903e531ce28b2d23be251ec1e2b45
Diffstat (limited to 'platform/ext')
-rw-r--r--platform/ext/index.rst3
-rw-r--r--platform/ext/platform_introduction.rst2
-rw-r--r--platform/ext/target/arm/mps2/an519/CMakeLists.txt (renamed from platform/ext/target/mps2/an519/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/mps2/an519/RTE_Device.h (renamed from platform/ext/target/mps2/an519/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/armclang/mps2_an519_bl2.sct (renamed from platform/ext/target/mps2/an519/armclang/mps2_an519_bl2.sct)0
-rw-r--r--platform/ext/target/arm/mps2/an519/armclang/mps2_an519_ns.sct (renamed from platform/ext/target/mps2/an519/armclang/mps2_an519_ns.sct)0
-rw-r--r--platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s (renamed from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s (renamed from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s (renamed from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/boot_hal.c (renamed from platform/ext/target/mps2/an519/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/cmsis.h (renamed from platform/ext/target/mps2/an519/cmsis_core/cmsis.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/cmsis_cpu.h (renamed from platform/ext/target/mps2/an519/cmsis_core/cmsis_cpu.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/mps2_an519.h (renamed from platform/ext/target/mps2/an519/cmsis_core/mps2_an519.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/platform_irq.h (renamed from platform/ext/target/mps2/an519/cmsis_core/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/platform_regs.h (renamed from platform/ext/target/mps2/an519/cmsis_core/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c (renamed from platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h (renamed from platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_driver_config.h (renamed from platform/ext/target/mps2/an519/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_Flash.c (renamed from platform/ext/target/mps2/an519/cmsis_drivers/Driver_Flash.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_MPC.c (renamed from platform/ext/target/mps2/an519/cmsis_drivers/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_PPC.c (renamed from platform/ext/target/mps2/an519/cmsis_drivers/Driver_PPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_USART.c (renamed from platform/ext/target/mps2/an519/cmsis_drivers/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/config.cmake (renamed from platform/ext/target/mps2/an519/config.cmake)0
-rw-r--r--platform/ext/target/arm/mps2/an519/device_cfg.h (renamed from platform/ext/target/mps2/an519/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/gcc/mps2_an519_bl2.ld (renamed from platform/ext/target/mps2/an519/gcc/mps2_an519_bl2.ld)0
-rw-r--r--platform/ext/target/arm/mps2/an519/gcc/mps2_an519_ns.ld (renamed from platform/ext/target/mps2/an519/gcc/mps2_an519_ns.ld)0
-rw-r--r--platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S (renamed from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S)0
-rw-r--r--platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S (renamed from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S)0
-rw-r--r--platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S (renamed from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S)0
-rw-r--r--platform/ext/target/arm/mps2/an519/iar/mps2_an519_bl2.icf (renamed from platform/ext/target/mps2/an519/iar/mps2_an519_bl2.icf)0
-rw-r--r--platform/ext/target/arm/mps2/an519/iar/mps2_an519_ns.icf (renamed from platform/ext/target/mps2/an519/iar/mps2_an519_ns.icf)0
-rw-r--r--platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s (renamed from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s (renamed from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s (renamed from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.c (renamed from platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.h (renamed from platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.c (renamed from platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.h (renamed from platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.c (renamed from platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.h (renamed from platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.c (renamed from platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.h (renamed from platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c (renamed from platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h (renamed from platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/partition/flash_layout.h (renamed from platform/ext/target/mps2/an519/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/partition/region_defs.h (renamed from platform/ext/target/mps2/an519/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/plat_test.c (renamed from platform/ext/target/mps2/an519/plat_test.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/preload.cmake (renamed from platform/ext/target/mps2/an519/preload.cmake)0
-rw-r--r--platform/ext/target/arm/mps2/an519/retarget/platform_retarget.h (renamed from platform/ext/target/mps2/an519/retarget/platform_retarget.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.c (renamed from platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.h (renamed from platform/ext/target/mps2/an519/retarget/platform_retarget_dev.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/retarget/platform_retarget_pins.h (renamed from platform/ext/target/mps2/an519/retarget/platform_retarget_pins.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/services/src/tfm_platform_system.c (renamed from platform/ext/target/mps2/an519/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/spm_hal.c (renamed from platform/ext/target/mps2/an519/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/target_cfg.c (renamed from platform/ext/target/mps2/an519/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/target_cfg.h (renamed from platform/ext/target/mps2/an519/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/an519/tfm_hal_isolation.c (renamed from platform/ext/target/mps2/an519/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/mps2/an519/tfm_peripherals_def.h (renamed from platform/ext/target/mps2/an519/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/CMakeLists.txt (renamed from platform/ext/target/mps2/an521/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/mps2/an521/RTE_Device.h (renamed from platform/ext/target/mps2/an521/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/armclang/mps2_an521_bl2.sct (renamed from platform/ext/target/mps2/an521/armclang/mps2_an521_bl2.sct)0
-rw-r--r--platform/ext/target/arm/mps2/an521/armclang/mps2_an521_ns.sct (renamed from platform/ext/target/mps2/an521/armclang/mps2_an521_ns.sct)0
-rw-r--r--platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s (renamed from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s (renamed from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s (renamed from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/boot_hal.c (renamed from platform/ext/target/mps2/an521/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/cmsis.h (renamed from platform/ext/target/mps2/an521/cmsis_core/cmsis.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/cmsis_cpu.h (renamed from platform/ext/target/mps2/an521/cmsis_core/cmsis_cpu.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/mps2_an521.h (renamed from platform/ext/target/mps2/an521/cmsis_core/mps2_an521.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/platform_irq.h (renamed from platform/ext/target/mps2/an521/cmsis_core/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/platform_regs.h (renamed from platform/ext/target/mps2/an521/cmsis_core/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c (renamed from platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h (renamed from platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_driver_config.h (renamed from platform/ext/target/mps2/an521/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_Flash.c (renamed from platform/ext/target/mps2/an521/cmsis_drivers/Driver_Flash.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_MPC.c (renamed from platform/ext/target/mps2/an521/cmsis_drivers/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_PPC.c (renamed from platform/ext/target/mps2/an521/cmsis_drivers/Driver_PPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_USART.c (renamed from platform/ext/target/mps2/an521/cmsis_drivers/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/config.cmake (renamed from platform/ext/target/mps2/an521/config.cmake)2
-rw-r--r--platform/ext/target/arm/mps2/an521/device_cfg.h (renamed from platform/ext/target/mps2/an521/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/gcc/mps2_an521_bl2.ld (renamed from platform/ext/target/mps2/an521/gcc/mps2_an521_bl2.ld)0
-rw-r--r--platform/ext/target/arm/mps2/an521/gcc/mps2_an521_ns.ld (renamed from platform/ext/target/mps2/an521/gcc/mps2_an521_ns.ld)0
-rw-r--r--platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S (renamed from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S)0
-rw-r--r--platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S (renamed from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S)0
-rw-r--r--platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S (renamed from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S)0
-rw-r--r--platform/ext/target/arm/mps2/an521/generated_file_list.yaml (renamed from platform/ext/target/mps2/an521/generated_file_list.yaml)0
-rw-r--r--platform/ext/target/arm/mps2/an521/iar/mps2_an521_bl2.icf (renamed from platform/ext/target/mps2/an521/iar/mps2_an521_bl2.icf)0
-rw-r--r--platform/ext/target/arm/mps2/an521/iar/mps2_an521_ns.icf (renamed from platform/ext/target/mps2/an521/iar/mps2_an521_ns.icf)0
-rw-r--r--platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s (renamed from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s (renamed from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s (renamed from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s)0
-rw-r--r--platform/ext/target/arm/mps2/an521/mbedtls_an521_conf.h (renamed from platform/ext/target/mps2/an521/mbedtls_an521_conf.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.c (renamed from platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.h (renamed from platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.c (renamed from platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.h (renamed from platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.c (renamed from platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.h (renamed from platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.c (renamed from platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.h (renamed from platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c (renamed from platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h (renamed from platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/partition/flash_layout.h (renamed from platform/ext/target/mps2/an521/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/partition/region_defs.h (renamed from platform/ext/target/mps2/an521/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/plat_test.c (renamed from platform/ext/target/mps2/an521/plat_test.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/preload.cmake (renamed from platform/ext/target/mps2/an521/preload.cmake)0
-rw-r--r--platform/ext/target/arm/mps2/an521/retarget/platform_retarget.h (renamed from platform/ext/target/mps2/an521/retarget/platform_retarget.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.c (renamed from platform/ext/target/mps2/an521/retarget/platform_retarget_dev.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.h (renamed from platform/ext/target/mps2/an521/retarget/platform_retarget_dev.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/retarget/platform_retarget_pins.h (renamed from platform/ext/target/mps2/an521/retarget/platform_retarget_pins.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/services/src/tfm_platform_system.c (renamed from platform/ext/target/mps2/an521/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/spm_hal.c (renamed from platform/ext/target/mps2/an521/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/target_cfg.c (renamed from platform/ext/target/mps2/an521/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/target_cfg.h (renamed from platform/ext/target/mps2/an521/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/an521/tfm_hal_isolation.c (renamed from platform/ext/target/mps2/an521/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/mps2/an521/tfm_peripherals_def.h (renamed from platform/ext/target/mps2/an521/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/mps2/common/smm_mps2.h (renamed from platform/ext/target/mps2/common/smm_mps2.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/CMakeLists.txt (renamed from platform/ext/target/mps2/fvp_sse300/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/boot_hal.c (renamed from platform/ext/target/mps2/fvp_sse300/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h (renamed from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/config.cmake (renamed from platform/ext/target/mps2/fvp_sse300/config.cmake)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/config/device_cfg.h (renamed from platform/ext/target/mps2/fvp_sse300/device/config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/cmsis.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/device_definition.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_description.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_irq.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_regs.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/include/system_core_init.h (renamed from platform/ext/target/mps2/fvp_sse300/device/include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct (renamed from platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct (renamed from platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/device_definition.c (renamed from platform/ext/target/mps2/fvp_sse300/device/source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf (renamed from platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf (renamed from platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c (renamed from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c (renamed from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c (renamed from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/device/source/system_core_init.c (renamed from platform/ext/target/mps2/fvp_sse300/device/source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h (renamed from platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/partition/flash_layout.h (renamed from platform/ext/target/mps2/fvp_sse300/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/partition/platform_base_address.h (renamed from platform/ext/target/mps2/fvp_sse300/partition/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/partition/region_defs.h (renamed from platform/ext/target/mps2/fvp_sse300/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/plat_test.c (renamed from platform/ext/target/mps2/fvp_sse300/plat_test.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/preload.cmake (renamed from platform/ext/target/mps2/fvp_sse300/preload.cmake)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/services/src/tfm_platform_system.c (renamed from platform/ext/target/mps2/fvp_sse300/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/spm_hal.c (renamed from platform/ext/target/mps2/fvp_sse300/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/target_cfg.c (renamed from platform/ext/target/mps2/fvp_sse300/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/target_cfg.h (renamed from platform/ext/target/mps2/fvp_sse300/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/tfm_hal_isolation.c (renamed from platform/ext/target/mps2/fvp_sse300/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/mps2/fvp_sse300/tfm_peripherals_def.h (renamed from platform/ext/target/mps2/fvp_sse300/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/CMakeLists.txt (renamed from platform/ext/target/mps3/an524/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/mps3/an524/boot_hal.c (renamed from platform/ext/target/mps3/an524/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_Flash.c (renamed from platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_MPC.c (renamed from platform/ext/target/mps3/an524/cmsis_drivers/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_PPC.c (renamed from platform/ext/target/mps3/an524/cmsis_drivers/Driver_PPC.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_USART.c (renamed from platform/ext/target/mps3/an524/cmsis_drivers/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/config/RTE_Device.h (renamed from platform/ext/target/mps3/an524/cmsis_drivers/config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h (renamed from platform/ext/target/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/config.cmake (renamed from platform/ext/target/mps3/an524/config.cmake)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/config/device_cfg.h (renamed from platform/ext/target/mps3/an524/device/config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/cmsis.h (renamed from platform/ext/target/mps3/an524/device/include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/device_definition.h (renamed from platform/ext/target/mps3/an524/device/include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/platform_base_address.h (renamed from platform/ext/target/mps3/an524/device/include/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/platform_description.h (renamed from platform/ext/target/mps3/an524/device/include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/platform_irq.h (renamed from platform/ext/target/mps3/an524/device/include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/platform_pins.h (renamed from platform/ext/target/mps3/an524/device/include/platform_pins.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/platform_regs.h (renamed from platform/ext/target/mps3/an524/device/include/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/include/system_core_init.h (renamed from platform/ext/target/mps3/an524/device/include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_bl2.sct (renamed from platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_bl2.sct)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_ns.sct (renamed from platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_ns.sct)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s (renamed from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s (renamed from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s (renamed from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/device_definition.c (renamed from platform/ext/target/mps3/an524/device/source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_bl2.ld (renamed from platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_bl2.ld)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_ns.ld (renamed from platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_ns.ld)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S (renamed from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S (renamed from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S (renamed from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_bl2.icf (renamed from platform/ext/target/mps3/an524/device/source/iar/mps3_an524_bl2.icf)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_ns.icf (renamed from platform/ext/target/mps3/an524/device/source/iar/mps3_an524_ns.icf)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s (renamed from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s (renamed from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s (renamed from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s)0
-rw-r--r--platform/ext/target/arm/mps3/an524/device/source/system_core_init.c (renamed from platform/ext/target/mps3/an524/device/source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.c (renamed from platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.h (renamed from platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.c (renamed from platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.h (renamed from platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.c (renamed from platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.h (renamed from platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.c (renamed from platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.h (renamed from platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.c (renamed from platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.h (renamed from platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/partition/flash_layout.h (renamed from platform/ext/target/mps3/an524/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/partition/region_defs.h (renamed from platform/ext/target/mps3/an524/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/plat_test.c (renamed from platform/ext/target/mps3/an524/plat_test.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/preload.cmake (renamed from platform/ext/target/mps3/an524/preload.cmake)0
-rw-r--r--platform/ext/target/arm/mps3/an524/services/src/tfm_platform_system.c (renamed from platform/ext/target/mps3/an524/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/spm_hal.c (renamed from platform/ext/target/mps3/an524/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/target_cfg.c (renamed from platform/ext/target/mps3/an524/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/target_cfg.h (renamed from platform/ext/target/mps3/an524/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps3/an524/tfm_hal_isolation.c (renamed from platform/ext/target/mps3/an524/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/mps3/an524/tfm_peripherals_def.h (renamed from platform/ext/target/mps3/an524/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/CMakeLists.txt (renamed from platform/ext/target/mps3/an547/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/mps3/an547/README.rst (renamed from platform/ext/target/mps3/an547/README.rst)0
-rw-r--r--platform/ext/target/arm/mps3/an547/boot_hal.c (renamed from platform/ext/target/mps3/an547/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c (renamed from platform/ext/target/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_Flash.c (renamed from platform/ext/target/mps3/an547/cmsis_drivers/Driver_Flash.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c (renamed from platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h (renamed from platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_USART.c (renamed from platform/ext/target/mps3/an547/cmsis_drivers/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/config/RTE_Device.h (renamed from platform/ext/target/mps3/an547/cmsis_drivers/config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h (renamed from platform/ext/target/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/config.cmake (renamed from platform/ext/target/mps3/an547/config.cmake)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/config/device_cfg.h (renamed from platform/ext/target/mps3/an547/device/config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/cmsis.h (renamed from platform/ext/target/mps3/an547/device/include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/device_definition.h (renamed from platform/ext/target/mps3/an547/device/include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/platform_description.h (renamed from platform/ext/target/mps3/an547/device/include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/platform_irq.h (renamed from platform/ext/target/mps3/an547/device/include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/platform_pins.h (renamed from platform/ext/target/mps3/an547/device/include/platform_pins.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/platform_regs.h (renamed from platform/ext/target/mps3/an547/device/include/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/include/system_core_init.h (renamed from platform/ext/target/mps3/an547/device/include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/armclang/an547_bl2.sct (renamed from platform/ext/target/mps3/an547/device/source/armclang/an547_bl2.sct)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/armclang/an547_ns.sct (renamed from platform/ext/target/mps3/an547/device/source/armclang/an547_ns.sct)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/device_definition.c (renamed from platform/ext/target/mps3/an547/device/source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/startup_an547_bl2.c (renamed from platform/ext/target/mps3/an547/device/source/startup_an547_bl2.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/startup_an547_ns.c (renamed from platform/ext/target/mps3/an547/device/source/startup_an547_ns.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/startup_an547_s.c (renamed from platform/ext/target/mps3/an547/device/source/startup_an547_s.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/device/source/system_core_init.c (renamed from platform/ext/target/mps3/an547/device/source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.c (renamed from platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.h (renamed from platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/partition/flash_layout.h (renamed from platform/ext/target/mps3/an547/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/partition/platform_base_address.h (renamed from platform/ext/target/mps3/an547/partition/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/partition/region_defs.h (renamed from platform/ext/target/mps3/an547/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/plat_test.c (renamed from platform/ext/target/mps3/an547/plat_test.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/preload.cmake (renamed from platform/ext/target/mps3/an547/preload.cmake)0
-rw-r--r--platform/ext/target/arm/mps3/an547/services/src/tfm_platform_system.c (renamed from platform/ext/target/mps3/an547/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/spm_hal.c (renamed from platform/ext/target/mps3/an547/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/target_cfg.c (renamed from platform/ext/target/mps3/an547/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/target_cfg.h (renamed from platform/ext/target/mps3/an547/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/mps3/an547/tfm_hal_isolation.c (renamed from platform/ext/target/mps3/an547/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/mps3/an547/tfm_peripherals_def.h (renamed from platform/ext/target/mps3/an547/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c (renamed from platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c (renamed from platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.c (renamed from platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.h (renamed from platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.c (renamed from platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.h (renamed from platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_process_spec_api.h (renamed from platform/ext/target/musca_b1/common/Native_Driver/gfc100_process_spec_api.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.c (renamed from platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.h (renamed from platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c (renamed from platform/ext/target/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c (renamed from platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h (renamed from platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/generated_file_list.yaml (renamed from platform/ext/target/musca_b1/generated_file_list.yaml)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h (renamed from platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h (renamed from platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/CMakeLists.txt (renamed from platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Config/device_cfg.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/cmsis.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/device_definition.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_base_address.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_description.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_irq.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/system_core_init.h (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/device_definition.c (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/system_core_init.c (renamed from platform/ext/target/musca_b1/secure_enclave/Device/Source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/boot_hal.c (renamed from platform/ext/target/musca_b1/secure_enclave/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/config.cmake (renamed from platform/ext/target/musca_b1/secure_enclave/config.cmake)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c (renamed from platform/ext/target/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.c (renamed from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.h (renamed from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c (renamed from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/partition/flash_layout.h (renamed from platform/ext/target/musca_b1/secure_enclave/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/partition/region_defs.h (renamed from platform/ext/target/musca_b1/secure_enclave/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/preload.cmake (renamed from platform/ext/target/musca_b1/secure_enclave/preload.cmake)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/preload_ns.cmake (renamed from platform/ext/target/musca_b1/secure_enclave/preload_ns.cmake)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/readme.rst (renamed from platform/ext/target/musca_b1/secure_enclave/readme.rst)5
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/services/src/tfm_platform_system.c (renamed from platform/ext/target/musca_b1/secure_enclave/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/spm_hal.c (renamed from platform/ext/target/musca_b1/secure_enclave/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.c (renamed from platform/ext/target/musca_b1/secure_enclave/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.h (renamed from platform/ext/target/musca_b1/secure_enclave/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/tfm_hal_isolation.c (renamed from platform/ext/target/musca_b1/secure_enclave/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/tfm_peripherals_def.h (renamed from platform/ext/target/musca_b1/secure_enclave/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/secure_enclave/uart_stdout.c (renamed from platform/ext/target/musca_b1/secure_enclave/uart_stdout.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h (renamed from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h (renamed from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c (renamed from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c (renamed from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c (renamed from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt (renamed from platform/ext/target/musca_b1/sse_200/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Config/device_cfg.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/cmsis.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/device_definition.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_base_address.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_description.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_irq.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_pins.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_regs.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Include/system_core_init.h (renamed from platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/device_definition.c (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Device/Source/system_core_init.c (renamed from platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h (renamed from platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/attest_hal.c (renamed from platform/ext/target/musca_b1/sse_200/attest_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/bl0/CMakeLists.txt (renamed from platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/bl0/bl0_main.c (renamed from platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/bl0/device_cfg.h (renamed from platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/boot_hal.c (renamed from platform/ext/target/musca_b1/sse_200/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/config.cmake (renamed from platform/ext/target/musca_b1/sse_200/config.cmake)2
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/crypto_keys.c (renamed from platform/ext/target/musca_b1/sse_200/crypto_keys.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.c (renamed from platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.h (renamed from platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_ns_mailbox.c (renamed from platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/partition/flash_layout.h (renamed from platform/ext/target/musca_b1/sse_200/partition/flash_layout.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/partition/region_defs.h (renamed from platform/ext/target/musca_b1/sse_200/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/partition/region_defs_bl0.h (renamed from platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/plat_test.c (renamed from platform/ext/target/musca_b1/sse_200/plat_test.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/preload.cmake (renamed from platform/ext/target/musca_b1/sse_200/preload.cmake)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/readme.rst (renamed from platform/ext/target/musca_b1/sse_200/readme.rst)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_ioctl_api.h (renamed from platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c (renamed from platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c (renamed from platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_platform_system.c (renamed from platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/spm_hal.c (renamed from platform/ext/target/musca_b1/sse_200/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/target_cfg.c (renamed from platform/ext/target/musca_b1/sse_200/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/target_cfg.h (renamed from platform/ext/target/musca_b1/sse_200/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/tfm_hal_isolation.c (renamed from platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/musca_b1/sse_200/tfm_peripherals_def.h (renamed from platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/RTE_Device.h (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Config/RTE_Device.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_MPC.c (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Driver_MPC.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_PPC.c (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Driver_PPC.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_USART.c (renamed from platform/ext/target/musca_s1/CMSIS_Driver/Driver_USART.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/CMakeLists.txt (renamed from platform/ext/target/musca_s1/CMakeLists.txt)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Config/device_cfg.h (renamed from platform/ext/target/musca_s1/Device/Config/device_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/cmsis.h (renamed from platform/ext/target/musca_s1/Device/Include/cmsis.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/device_definition.h (renamed from platform/ext/target/musca_s1/Device/Include/device_definition.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/platform_base_address.h (renamed from platform/ext/target/musca_s1/Device/Include/platform_base_address.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/platform_description.h (renamed from platform/ext/target/musca_s1/Device/Include/platform_description.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/platform_irq.h (renamed from platform/ext/target/musca_s1/Device/Include/platform_irq.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/platform_pins.h (renamed from platform/ext/target/musca_s1/Device/Include/platform_pins.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/platform_regs.h (renamed from platform/ext/target/musca_s1/Device/Include/platform_regs.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Include/system_core_init.h (renamed from platform/ext/target/musca_s1/Device/Include/system_core_init.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_bl2.sct (renamed from platform/ext/target/musca_s1/Device/Source/armclang/musca_bl2.sct)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_ns.sct (renamed from platform/ext/target/musca_s1/Device/Source/armclang/musca_ns.sct)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s (renamed from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s (renamed from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s (renamed from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/device_definition.c (renamed from platform/ext/target/musca_s1/Device/Source/device_definition.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_bl2.ld (renamed from platform/ext/target/musca_s1/Device/Source/gcc/musca_bl2.ld)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_ns.ld (renamed from platform/ext/target/musca_s1/Device/Source/gcc/musca_ns.ld)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S (renamed from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S (renamed from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S (renamed from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S)0
-rw-r--r--platform/ext/target/arm/musca_s1/Device/Source/system_core_init.c (renamed from platform/ext/target/musca_s1/Device/Source/system_core_init.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.c (renamed from platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.h (renamed from platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/cache_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/cache_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.c (renamed from platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.h (renamed from platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/boot_hal.c (renamed from platform/ext/target/musca_s1/boot_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/config.cmake (renamed from platform/ext/target/musca_s1/config.cmake)0
-rw-r--r--platform/ext/target/arm/musca_s1/crypto_keys.c (renamed from platform/ext/target/musca_s1/crypto_keys.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/partition/flash_layout.h (renamed from platform/ext/target/musca_s1/partition/flash_layout.h)4
-rw-r--r--platform/ext/target/arm/musca_s1/partition/region_defs.h (renamed from platform/ext/target/musca_s1/partition/region_defs.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/plat_test.c (renamed from platform/ext/target/musca_s1/plat_test.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/preload.cmake (renamed from platform/ext/target/musca_s1/preload.cmake)0
-rw-r--r--platform/ext/target/arm/musca_s1/services/include/tfm_ioctl_api.h (renamed from platform/ext/target/musca_s1/services/include/tfm_ioctl_api.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_ns_api.c (renamed from platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_s_api.c (renamed from platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/services/src/tfm_platform_system.c (renamed from platform/ext/target/musca_s1/services/src/tfm_platform_system.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/spm_hal.c (renamed from platform/ext/target/musca_s1/spm_hal.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/target_cfg.c (renamed from platform/ext/target/musca_s1/target_cfg.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/target_cfg.h (renamed from platform/ext/target/musca_s1/target_cfg.h)0
-rw-r--r--platform/ext/target/arm/musca_s1/tfm_hal_isolation.c (renamed from platform/ext/target/musca_s1/tfm_hal_isolation.c)0
-rw-r--r--platform/ext/target/arm/musca_s1/tfm_peripherals_def.h (renamed from platform/ext/target/musca_s1/tfm_peripherals_def.h)0
450 files changed, 9 insertions, 9 deletions
diff --git a/platform/ext/index.rst b/platform/ext/index.rst
index 3c3e8d1761..36e3af98f7 100644
--- a/platform/ext/index.rst
+++ b/platform/ext/index.rst
@@ -15,8 +15,7 @@ Supported Platforms
:caption: arm
:glob:
- target/musca_*/**
- target/mps*/**
+ target/arm/**
otp_provisioning.rst
.. toctree::
diff --git a/platform/ext/platform_introduction.rst b/platform/ext/platform_introduction.rst
index 6bf10640b8..fec964122e 100644
--- a/platform/ext/platform_introduction.rst
+++ b/platform/ext/platform_introduction.rst
@@ -48,7 +48,7 @@ Platforms introduction
- Secure Enclave system:
- - :doc:`Musca-B1 Secure Enclave. </platform/ext/target/musca_b1/secure_enclave/readme>`
+ - :doc:`Musca-B1 Secure Enclave. </platform/ext/target/arm/musca_b1/secure_enclave/readme>`
The document :doc:`Platform Deprecation and Removal </platform/ext/platform_deprecation>`
lists the deprecated platforms planned to be removed from upstream.
diff --git a/platform/ext/target/mps2/an519/CMakeLists.txt b/platform/ext/target/arm/mps2/an519/CMakeLists.txt
index 7a665eb53e..7a665eb53e 100644
--- a/platform/ext/target/mps2/an519/CMakeLists.txt
+++ b/platform/ext/target/arm/mps2/an519/CMakeLists.txt
diff --git a/platform/ext/target/mps2/an519/RTE_Device.h b/platform/ext/target/arm/mps2/an519/RTE_Device.h
index 3eef147e17..3eef147e17 100644
--- a/platform/ext/target/mps2/an519/RTE_Device.h
+++ b/platform/ext/target/arm/mps2/an519/RTE_Device.h
diff --git a/platform/ext/target/mps2/an519/armclang/mps2_an519_bl2.sct b/platform/ext/target/arm/mps2/an519/armclang/mps2_an519_bl2.sct
index 309bddfdae..309bddfdae 100644
--- a/platform/ext/target/mps2/an519/armclang/mps2_an519_bl2.sct
+++ b/platform/ext/target/arm/mps2/an519/armclang/mps2_an519_bl2.sct
diff --git a/platform/ext/target/mps2/an519/armclang/mps2_an519_ns.sct b/platform/ext/target/arm/mps2/an519/armclang/mps2_an519_ns.sct
index e25b2d72fe..e25b2d72fe 100644
--- a/platform/ext/target/mps2/an519/armclang/mps2_an519_ns.sct
+++ b/platform/ext/target/arm/mps2/an519/armclang/mps2_an519_ns.sct
diff --git a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s
index 658b9285cc..658b9285cc 100644
--- a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s
+++ b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s
diff --git a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s
index a56a26d445..a56a26d445 100644
--- a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s
+++ b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s
diff --git a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s
index 2bcbb6702b..2bcbb6702b 100644
--- a/platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s
+++ b/platform/ext/target/arm/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s
diff --git a/platform/ext/target/mps2/an519/boot_hal.c b/platform/ext/target/arm/mps2/an519/boot_hal.c
index 865700039c..865700039c 100644
--- a/platform/ext/target/mps2/an519/boot_hal.c
+++ b/platform/ext/target/arm/mps2/an519/boot_hal.c
diff --git a/platform/ext/target/mps2/an519/cmsis_core/cmsis.h b/platform/ext/target/arm/mps2/an519/cmsis_core/cmsis.h
index 90807395ed..90807395ed 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/cmsis.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/cmsis.h
diff --git a/platform/ext/target/mps2/an519/cmsis_core/cmsis_cpu.h b/platform/ext/target/arm/mps2/an519/cmsis_core/cmsis_cpu.h
index cd9cff61c1..cd9cff61c1 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/cmsis_cpu.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/cmsis_cpu.h
diff --git a/platform/ext/target/mps2/an519/cmsis_core/mps2_an519.h b/platform/ext/target/arm/mps2/an519/cmsis_core/mps2_an519.h
index 52153eeca9..52153eeca9 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/mps2_an519.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/mps2_an519.h
diff --git a/platform/ext/target/mps2/an519/cmsis_core/platform_irq.h b/platform/ext/target/arm/mps2/an519/cmsis_core/platform_irq.h
index 856b4d60d7..856b4d60d7 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/platform_irq.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/platform_irq.h
diff --git a/platform/ext/target/mps2/an519/cmsis_core/platform_regs.h b/platform/ext/target/arm/mps2/an519/cmsis_core/platform_regs.h
index 789661e125..789661e125 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/platform_regs.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/platform_regs.h
diff --git a/platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c b/platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c
index 0cb198fe5e..0cb198fe5e 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c
diff --git a/platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h b/platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h
index a98ea4ba6f..a98ea4ba6f 100644
--- a/platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h
diff --git a/platform/ext/target/mps2/an519/cmsis_driver_config.h b/platform/ext/target/arm/mps2/an519/cmsis_driver_config.h
index cab3b63d8f..cab3b63d8f 100644
--- a/platform/ext/target/mps2/an519/cmsis_driver_config.h
+++ b/platform/ext/target/arm/mps2/an519/cmsis_driver_config.h
diff --git a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_Flash.c
index 525956d4a8..525956d4a8 100644
--- a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_MPC.c b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_MPC.c
index b0e62dddd3..b0e62dddd3 100644
--- a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_MPC.c
+++ b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_MPC.c
diff --git a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_PPC.c b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_PPC.c
index fc198a2bda..fc198a2bda 100644
--- a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_PPC.c
+++ b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_PPC.c
diff --git a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_USART.c
index 3b35d0a9d1..3b35d0a9d1 100644
--- a/platform/ext/target/mps2/an519/cmsis_drivers/Driver_USART.c
+++ b/platform/ext/target/arm/mps2/an519/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/mps2/an519/config.cmake b/platform/ext/target/arm/mps2/an519/config.cmake
index a81c8a1137..a81c8a1137 100644
--- a/platform/ext/target/mps2/an519/config.cmake
+++ b/platform/ext/target/arm/mps2/an519/config.cmake
diff --git a/platform/ext/target/mps2/an519/device_cfg.h b/platform/ext/target/arm/mps2/an519/device_cfg.h
index 2a0f944f10..2a0f944f10 100644
--- a/platform/ext/target/mps2/an519/device_cfg.h
+++ b/platform/ext/target/arm/mps2/an519/device_cfg.h
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_bl2.ld b/platform/ext/target/arm/mps2/an519/gcc/mps2_an519_bl2.ld
index 2a8eae34e7..2a8eae34e7 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_bl2.ld
+++ b/platform/ext/target/arm/mps2/an519/gcc/mps2_an519_bl2.ld
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_ns.ld b/platform/ext/target/arm/mps2/an519/gcc/mps2_an519_ns.ld
index 1bdcbfb1fa..1bdcbfb1fa 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_ns.ld
+++ b/platform/ext/target/arm/mps2/an519/gcc/mps2_an519_ns.ld
diff --git a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S
index 1816a0c114..1816a0c114 100644
--- a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S
+++ b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S
diff --git a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S
index 9edcfdba98..9edcfdba98 100644
--- a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S
+++ b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S
diff --git a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S
index aca6a49af6..aca6a49af6 100644
--- a/platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S
+++ b/platform/ext/target/arm/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S
diff --git a/platform/ext/target/mps2/an519/iar/mps2_an519_bl2.icf b/platform/ext/target/arm/mps2/an519/iar/mps2_an519_bl2.icf
index 9bdd8bf3e1..9bdd8bf3e1 100644
--- a/platform/ext/target/mps2/an519/iar/mps2_an519_bl2.icf
+++ b/platform/ext/target/arm/mps2/an519/iar/mps2_an519_bl2.icf
diff --git a/platform/ext/target/mps2/an519/iar/mps2_an519_ns.icf b/platform/ext/target/arm/mps2/an519/iar/mps2_an519_ns.icf
index 1eb6137e39..1eb6137e39 100644
--- a/platform/ext/target/mps2/an519/iar/mps2_an519_ns.icf
+++ b/platform/ext/target/arm/mps2/an519/iar/mps2_an519_ns.icf
diff --git a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s
index 753e5f6614..753e5f6614 100644
--- a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s
+++ b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s
diff --git a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s
index 62b98c6d4c..62b98c6d4c 100644
--- a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s
+++ b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s
diff --git a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s
index d1043e92c5..d1043e92c5 100644
--- a/platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s
+++ b/platform/ext/target/arm/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s
diff --git a/platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.c b/platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.c
index d61ae483ac..d61ae483ac 100644
--- a/platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.c
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.c
diff --git a/platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.h b/platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.h
index 64d82000d7..64d82000d7 100644
--- a/platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.h
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/arm_uart_drv.h
diff --git a/platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.c b/platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.c
index e842681cd6..e842681cd6 100644
--- a/platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.c
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.c
diff --git a/platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.h b/platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.h
index 02bd1d9198..02bd1d9198 100644
--- a/platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.h
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/mpc_sie200_drv.h
diff --git a/platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.c b/platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.c
index 9a2656cd4d..9a2656cd4d 100644
--- a/platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.c
diff --git a/platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.h b/platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.h
index 70590bcd2c..70590bcd2c 100644
--- a/platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/mpu_armv8m_drv.h
diff --git a/platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.c b/platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.c
index 8db96e24a6..8db96e24a6 100644
--- a/platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.c
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.c
diff --git a/platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.h b/platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.h
index c09650bac5..c09650bac5 100644
--- a/platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.h
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/ppc_sse200_drv.h
diff --git a/platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c b/platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c
index 1037f2da04..1037f2da04 100644
--- a/platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c
diff --git a/platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h b/platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h
index 52d9d5c986..52d9d5c986 100644
--- a/platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h
+++ b/platform/ext/target/arm/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h
diff --git a/platform/ext/target/mps2/an519/partition/flash_layout.h b/platform/ext/target/arm/mps2/an519/partition/flash_layout.h
index 6c3208d8f2..6c3208d8f2 100644
--- a/platform/ext/target/mps2/an519/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps2/an519/partition/flash_layout.h
diff --git a/platform/ext/target/mps2/an519/partition/region_defs.h b/platform/ext/target/arm/mps2/an519/partition/region_defs.h
index 417aa23e19..417aa23e19 100644
--- a/platform/ext/target/mps2/an519/partition/region_defs.h
+++ b/platform/ext/target/arm/mps2/an519/partition/region_defs.h
diff --git a/platform/ext/target/mps2/an519/plat_test.c b/platform/ext/target/arm/mps2/an519/plat_test.c
index e77eb1a2ab..e77eb1a2ab 100644
--- a/platform/ext/target/mps2/an519/plat_test.c
+++ b/platform/ext/target/arm/mps2/an519/plat_test.c
diff --git a/platform/ext/target/mps2/an519/preload.cmake b/platform/ext/target/arm/mps2/an519/preload.cmake
index 31d5c7481c..31d5c7481c 100644
--- a/platform/ext/target/mps2/an519/preload.cmake
+++ b/platform/ext/target/arm/mps2/an519/preload.cmake
diff --git a/platform/ext/target/mps2/an519/retarget/platform_retarget.h b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget.h
index aeed37663f..aeed37663f 100644
--- a/platform/ext/target/mps2/an519/retarget/platform_retarget.h
+++ b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget.h
diff --git a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.c
index f76347996e..f76347996e 100644
--- a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c
+++ b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.c
diff --git a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.h b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.h
index d8028d7c10..d8028d7c10 100644
--- a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.h
+++ b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_dev.h
diff --git a/platform/ext/target/mps2/an519/retarget/platform_retarget_pins.h b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_pins.h
index a20f584f4f..a20f584f4f 100644
--- a/platform/ext/target/mps2/an519/retarget/platform_retarget_pins.h
+++ b/platform/ext/target/arm/mps2/an519/retarget/platform_retarget_pins.h
diff --git a/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c b/platform/ext/target/arm/mps2/an519/services/src/tfm_platform_system.c
index 44fafbccd1..44fafbccd1 100644
--- a/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/mps2/an519/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/mps2/an519/spm_hal.c b/platform/ext/target/arm/mps2/an519/spm_hal.c
index 02cd47a97b..02cd47a97b 100644
--- a/platform/ext/target/mps2/an519/spm_hal.c
+++ b/platform/ext/target/arm/mps2/an519/spm_hal.c
diff --git a/platform/ext/target/mps2/an519/target_cfg.c b/platform/ext/target/arm/mps2/an519/target_cfg.c
index 9127926bf8..9127926bf8 100644
--- a/platform/ext/target/mps2/an519/target_cfg.c
+++ b/platform/ext/target/arm/mps2/an519/target_cfg.c
diff --git a/platform/ext/target/mps2/an519/target_cfg.h b/platform/ext/target/arm/mps2/an519/target_cfg.h
index f427b5f193..f427b5f193 100644
--- a/platform/ext/target/mps2/an519/target_cfg.h
+++ b/platform/ext/target/arm/mps2/an519/target_cfg.h
diff --git a/platform/ext/target/mps2/an519/tfm_hal_isolation.c b/platform/ext/target/arm/mps2/an519/tfm_hal_isolation.c
index a396e51abd..a396e51abd 100644
--- a/platform/ext/target/mps2/an519/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/mps2/an519/tfm_hal_isolation.c
diff --git a/platform/ext/target/mps2/an519/tfm_peripherals_def.h b/platform/ext/target/arm/mps2/an519/tfm_peripherals_def.h
index 4ddf169ea9..4ddf169ea9 100644
--- a/platform/ext/target/mps2/an519/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/mps2/an519/tfm_peripherals_def.h
diff --git a/platform/ext/target/mps2/an521/CMakeLists.txt b/platform/ext/target/arm/mps2/an521/CMakeLists.txt
index 840fded598..840fded598 100644
--- a/platform/ext/target/mps2/an521/CMakeLists.txt
+++ b/platform/ext/target/arm/mps2/an521/CMakeLists.txt
diff --git a/platform/ext/target/mps2/an521/RTE_Device.h b/platform/ext/target/arm/mps2/an521/RTE_Device.h
index 3eef147e17..3eef147e17 100644
--- a/platform/ext/target/mps2/an521/RTE_Device.h
+++ b/platform/ext/target/arm/mps2/an521/RTE_Device.h
diff --git a/platform/ext/target/mps2/an521/armclang/mps2_an521_bl2.sct b/platform/ext/target/arm/mps2/an521/armclang/mps2_an521_bl2.sct
index 6a6bcd481b..6a6bcd481b 100644
--- a/platform/ext/target/mps2/an521/armclang/mps2_an521_bl2.sct
+++ b/platform/ext/target/arm/mps2/an521/armclang/mps2_an521_bl2.sct
diff --git a/platform/ext/target/mps2/an521/armclang/mps2_an521_ns.sct b/platform/ext/target/arm/mps2/an521/armclang/mps2_an521_ns.sct
index e25b2d72fe..e25b2d72fe 100644
--- a/platform/ext/target/mps2/an521/armclang/mps2_an521_ns.sct
+++ b/platform/ext/target/arm/mps2/an521/armclang/mps2_an521_ns.sct
diff --git a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s
index 615d608c63..615d608c63 100644
--- a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s
+++ b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s
diff --git a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s
index 96089a15f1..96089a15f1 100644
--- a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s
+++ b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s
diff --git a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s
index 23f2cc88db..23f2cc88db 100644
--- a/platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s
+++ b/platform/ext/target/arm/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s
diff --git a/platform/ext/target/mps2/an521/boot_hal.c b/platform/ext/target/arm/mps2/an521/boot_hal.c
index 9e93972487..9e93972487 100644
--- a/platform/ext/target/mps2/an521/boot_hal.c
+++ b/platform/ext/target/arm/mps2/an521/boot_hal.c
diff --git a/platform/ext/target/mps2/an521/cmsis_core/cmsis.h b/platform/ext/target/arm/mps2/an521/cmsis_core/cmsis.h
index 8c82e5a472..8c82e5a472 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/cmsis.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/cmsis.h
diff --git a/platform/ext/target/mps2/an521/cmsis_core/cmsis_cpu.h b/platform/ext/target/arm/mps2/an521/cmsis_core/cmsis_cpu.h
index b94fcd9a46..b94fcd9a46 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/cmsis_cpu.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/cmsis_cpu.h
diff --git a/platform/ext/target/mps2/an521/cmsis_core/mps2_an521.h b/platform/ext/target/arm/mps2/an521/cmsis_core/mps2_an521.h
index a42670a87f..a42670a87f 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/mps2_an521.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/mps2_an521.h
diff --git a/platform/ext/target/mps2/an521/cmsis_core/platform_irq.h b/platform/ext/target/arm/mps2/an521/cmsis_core/platform_irq.h
index a27571499a..a27571499a 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/platform_irq.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/platform_irq.h
diff --git a/platform/ext/target/mps2/an521/cmsis_core/platform_regs.h b/platform/ext/target/arm/mps2/an521/cmsis_core/platform_regs.h
index 5844b6074c..5844b6074c 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/platform_regs.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/platform_regs.h
diff --git a/platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c b/platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c
index c4d42fc8c9..c4d42fc8c9 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c
diff --git a/platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h b/platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h
index 0bd1727f6c..0bd1727f6c 100644
--- a/platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h
diff --git a/platform/ext/target/mps2/an521/cmsis_driver_config.h b/platform/ext/target/arm/mps2/an521/cmsis_driver_config.h
index cab3b63d8f..cab3b63d8f 100644
--- a/platform/ext/target/mps2/an521/cmsis_driver_config.h
+++ b/platform/ext/target/arm/mps2/an521/cmsis_driver_config.h
diff --git a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_Flash.c
index 525956d4a8..525956d4a8 100644
--- a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_MPC.c b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_MPC.c
index b0e62dddd3..b0e62dddd3 100644
--- a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_MPC.c
+++ b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_MPC.c
diff --git a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_PPC.c b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_PPC.c
index fc198a2bda..fc198a2bda 100644
--- a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_PPC.c
+++ b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_PPC.c
diff --git a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_USART.c
index 3b35d0a9d1..3b35d0a9d1 100644
--- a/platform/ext/target/mps2/an521/cmsis_drivers/Driver_USART.c
+++ b/platform/ext/target/arm/mps2/an521/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/mps2/an521/config.cmake b/platform/ext/target/arm/mps2/an521/config.cmake
index 1d3b682c6a..b0dbc04c51 100644
--- a/platform/ext/target/mps2/an521/config.cmake
+++ b/platform/ext/target/arm/mps2/an521/config.cmake
@@ -5,7 +5,7 @@
#
#-------------------------------------------------------------------------------
-set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/target/mps2/an521/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE)
+set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/target/arm/mps2/an521/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE)
if(TFM_PSA_API)
set(TFM_MBEDCRYPTO_PLATFORM_EXTRA_CONFIG_PATH ${CMAKE_CURRENT_LIST_DIR}/mbedtls_an521_conf.h CACHE FILEPATH "Config to append to standard Mbed Crypto config, used by platforms to configure feature support")
diff --git a/platform/ext/target/mps2/an521/device_cfg.h b/platform/ext/target/arm/mps2/an521/device_cfg.h
index 2a0f944f10..2a0f944f10 100644
--- a/platform/ext/target/mps2/an521/device_cfg.h
+++ b/platform/ext/target/arm/mps2/an521/device_cfg.h
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_bl2.ld b/platform/ext/target/arm/mps2/an521/gcc/mps2_an521_bl2.ld
index 1b4b995599..1b4b995599 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_bl2.ld
+++ b/platform/ext/target/arm/mps2/an521/gcc/mps2_an521_bl2.ld
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_ns.ld b/platform/ext/target/arm/mps2/an521/gcc/mps2_an521_ns.ld
index da4dfe5e97..da4dfe5e97 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_ns.ld
+++ b/platform/ext/target/arm/mps2/an521/gcc/mps2_an521_ns.ld
diff --git a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S
index a841d043d5..a841d043d5 100644
--- a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S
+++ b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S
diff --git a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S
index cc55453bc3..cc55453bc3 100644
--- a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S
+++ b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S
diff --git a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S
index b2063174d9..b2063174d9 100644
--- a/platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S
+++ b/platform/ext/target/arm/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S
diff --git a/platform/ext/target/mps2/an521/generated_file_list.yaml b/platform/ext/target/arm/mps2/an521/generated_file_list.yaml
index fc36ea2f42..fc36ea2f42 100644
--- a/platform/ext/target/mps2/an521/generated_file_list.yaml
+++ b/platform/ext/target/arm/mps2/an521/generated_file_list.yaml
diff --git a/platform/ext/target/mps2/an521/iar/mps2_an521_bl2.icf b/platform/ext/target/arm/mps2/an521/iar/mps2_an521_bl2.icf
index c336ef5a22..c336ef5a22 100644
--- a/platform/ext/target/mps2/an521/iar/mps2_an521_bl2.icf
+++ b/platform/ext/target/arm/mps2/an521/iar/mps2_an521_bl2.icf
diff --git a/platform/ext/target/mps2/an521/iar/mps2_an521_ns.icf b/platform/ext/target/arm/mps2/an521/iar/mps2_an521_ns.icf
index 440867a70a..440867a70a 100644
--- a/platform/ext/target/mps2/an521/iar/mps2_an521_ns.icf
+++ b/platform/ext/target/arm/mps2/an521/iar/mps2_an521_ns.icf
diff --git a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s
index 5b5079052f..5b5079052f 100644
--- a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s
+++ b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s
diff --git a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s
index 403a90e3c3..403a90e3c3 100644
--- a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s
+++ b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s
diff --git a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s
index 713f22ce7f..713f22ce7f 100644
--- a/platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s
+++ b/platform/ext/target/arm/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s
diff --git a/platform/ext/target/mps2/an521/mbedtls_an521_conf.h b/platform/ext/target/arm/mps2/an521/mbedtls_an521_conf.h
index ba37aff9eb..ba37aff9eb 100644
--- a/platform/ext/target/mps2/an521/mbedtls_an521_conf.h
+++ b/platform/ext/target/arm/mps2/an521/mbedtls_an521_conf.h
diff --git a/platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.c b/platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.c
index d61ae483ac..d61ae483ac 100644
--- a/platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.c
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.c
diff --git a/platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.h b/platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.h
index 64d82000d7..64d82000d7 100644
--- a/platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.h
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/arm_uart_drv.h
diff --git a/platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.c b/platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.c
index e842681cd6..e842681cd6 100644
--- a/platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.c
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.c
diff --git a/platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.h b/platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.h
index 02bd1d9198..02bd1d9198 100644
--- a/platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.h
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/mpc_sie200_drv.h
diff --git a/platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.c b/platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.c
index 8231811232..8231811232 100644
--- a/platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.c
diff --git a/platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.h b/platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.h
index 78da639300..78da639300 100644
--- a/platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/mpu_armv8m_drv.h
diff --git a/platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.c b/platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.c
index 8db96e24a6..8db96e24a6 100644
--- a/platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.c
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.c
diff --git a/platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.h b/platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.h
index c09650bac5..c09650bac5 100644
--- a/platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.h
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/ppc_sse200_drv.h
diff --git a/platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c b/platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c
index 1037f2da04..1037f2da04 100644
--- a/platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c
diff --git a/platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h b/platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h
index 52d9d5c986..52d9d5c986 100644
--- a/platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h
+++ b/platform/ext/target/arm/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h
diff --git a/platform/ext/target/mps2/an521/partition/flash_layout.h b/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
index 6a0e442e62..6a0e442e62 100644
--- a/platform/ext/target/mps2/an521/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
diff --git a/platform/ext/target/mps2/an521/partition/region_defs.h b/platform/ext/target/arm/mps2/an521/partition/region_defs.h
index bef2b5120e..bef2b5120e 100644
--- a/platform/ext/target/mps2/an521/partition/region_defs.h
+++ b/platform/ext/target/arm/mps2/an521/partition/region_defs.h
diff --git a/platform/ext/target/mps2/an521/plat_test.c b/platform/ext/target/arm/mps2/an521/plat_test.c
index 83528581a6..83528581a6 100644
--- a/platform/ext/target/mps2/an521/plat_test.c
+++ b/platform/ext/target/arm/mps2/an521/plat_test.c
diff --git a/platform/ext/target/mps2/an521/preload.cmake b/platform/ext/target/arm/mps2/an521/preload.cmake
index 436fed7203..436fed7203 100644
--- a/platform/ext/target/mps2/an521/preload.cmake
+++ b/platform/ext/target/arm/mps2/an521/preload.cmake
diff --git a/platform/ext/target/mps2/an521/retarget/platform_retarget.h b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget.h
index 9c93895fbf..9c93895fbf 100644
--- a/platform/ext/target/mps2/an521/retarget/platform_retarget.h
+++ b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget.h
diff --git a/platform/ext/target/mps2/an521/retarget/platform_retarget_dev.c b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.c
index 620b390759..620b390759 100644
--- a/platform/ext/target/mps2/an521/retarget/platform_retarget_dev.c
+++ b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.c
diff --git a/platform/ext/target/mps2/an521/retarget/platform_retarget_dev.h b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.h
index 772a5af371..772a5af371 100644
--- a/platform/ext/target/mps2/an521/retarget/platform_retarget_dev.h
+++ b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_dev.h
diff --git a/platform/ext/target/mps2/an521/retarget/platform_retarget_pins.h b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_pins.h
index d2b7e438aa..d2b7e438aa 100644
--- a/platform/ext/target/mps2/an521/retarget/platform_retarget_pins.h
+++ b/platform/ext/target/arm/mps2/an521/retarget/platform_retarget_pins.h
diff --git a/platform/ext/target/mps2/an521/services/src/tfm_platform_system.c b/platform/ext/target/arm/mps2/an521/services/src/tfm_platform_system.c
index 93ba614c41..93ba614c41 100644
--- a/platform/ext/target/mps2/an521/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/mps2/an521/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/mps2/an521/spm_hal.c b/platform/ext/target/arm/mps2/an521/spm_hal.c
index 58dee4d888..58dee4d888 100644
--- a/platform/ext/target/mps2/an521/spm_hal.c
+++ b/platform/ext/target/arm/mps2/an521/spm_hal.c
diff --git a/platform/ext/target/mps2/an521/target_cfg.c b/platform/ext/target/arm/mps2/an521/target_cfg.c
index a57a2e80cd..a57a2e80cd 100644
--- a/platform/ext/target/mps2/an521/target_cfg.c
+++ b/platform/ext/target/arm/mps2/an521/target_cfg.c
diff --git a/platform/ext/target/mps2/an521/target_cfg.h b/platform/ext/target/arm/mps2/an521/target_cfg.h
index 25cc28ae5d..25cc28ae5d 100644
--- a/platform/ext/target/mps2/an521/target_cfg.h
+++ b/platform/ext/target/arm/mps2/an521/target_cfg.h
diff --git a/platform/ext/target/mps2/an521/tfm_hal_isolation.c b/platform/ext/target/arm/mps2/an521/tfm_hal_isolation.c
index dfafd39094..dfafd39094 100644
--- a/platform/ext/target/mps2/an521/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/mps2/an521/tfm_hal_isolation.c
diff --git a/platform/ext/target/mps2/an521/tfm_peripherals_def.h b/platform/ext/target/arm/mps2/an521/tfm_peripherals_def.h
index c5b80bf3b6..c5b80bf3b6 100644
--- a/platform/ext/target/mps2/an521/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/mps2/an521/tfm_peripherals_def.h
diff --git a/platform/ext/target/mps2/common/smm_mps2.h b/platform/ext/target/arm/mps2/common/smm_mps2.h
index 2d6fabe02e..2d6fabe02e 100644
--- a/platform/ext/target/mps2/common/smm_mps2.h
+++ b/platform/ext/target/arm/mps2/common/smm_mps2.h
diff --git a/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt b/platform/ext/target/arm/mps2/fvp_sse300/CMakeLists.txt
index 6b417cd94e..6b417cd94e 100644
--- a/platform/ext/target/mps2/fvp_sse300/CMakeLists.txt
+++ b/platform/ext/target/arm/mps2/fvp_sse300/CMakeLists.txt
diff --git a/platform/ext/target/mps2/fvp_sse300/boot_hal.c b/platform/ext/target/arm/mps2/fvp_sse300/boot_hal.c
index 9e93972487..9e93972487 100644
--- a/platform/ext/target/mps2/fvp_sse300/boot_hal.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/boot_hal.c
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c
index 25966e5eb5..25966e5eb5 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c
index 53a46180e8..53a46180e8 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c
index c16cc4aa0a..c16cc4aa0a 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h
index c07fed07f4..c07fed07f4 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c
index cb3a14ad3e..cb3a14ad3e 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h
index 92661543e2..92661543e2 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h
diff --git a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h
index ba3639413d..ba3639413d 100644
--- a/platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h
diff --git a/platform/ext/target/mps2/fvp_sse300/config.cmake b/platform/ext/target/arm/mps2/fvp_sse300/config.cmake
index a81c8a1137..a81c8a1137 100644
--- a/platform/ext/target/mps2/fvp_sse300/config.cmake
+++ b/platform/ext/target/arm/mps2/fvp_sse300/config.cmake
diff --git a/platform/ext/target/mps2/fvp_sse300/device/config/device_cfg.h b/platform/ext/target/arm/mps2/fvp_sse300/device/config/device_cfg.h
index cdc20a0e80..cdc20a0e80 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/config/device_cfg.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/config/device_cfg.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/cmsis.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/cmsis.h
index dbd93f43d8..dbd93f43d8 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/cmsis.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/cmsis.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/device_definition.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/device_definition.h
index c83f0e6995..c83f0e6995 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/device_definition.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/device_definition.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/platform_description.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_description.h
index 8ec0197d32..8ec0197d32 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/platform_description.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_description.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/platform_irq.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_irq.h
index 7a90b8b8e6..7a90b8b8e6 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/platform_irq.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_irq.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/platform_regs.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_regs.h
index a3ec626b62..a3ec626b62 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/platform_regs.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/platform_regs.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/include/system_core_init.h b/platform/ext/target/arm/mps2/fvp_sse300/device/include/system_core_init.h
index 26e2cbd1cb..26e2cbd1cb 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/include/system_core_init.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/include/system_core_init.h
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct b/platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct
index 1f6a34aff3..1f6a34aff3 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct b/platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct
index 92707b9ce5..92707b9ce5 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/device_definition.c b/platform/ext/target/arm/mps2/fvp_sse300/device/source/device_definition.c
index 5b57b7c655..5b57b7c655 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/device_definition.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/device_definition.c
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf b/platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf
index 05c2c8364b..05c2c8364b 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf b/platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf
index 1eb6137e39..1eb6137e39 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c
index e36715d066..e36715d066 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c
index 90230777e9..90230777e9 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c
index 8c6046fb2b..8c6046fb2b 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c
diff --git a/platform/ext/target/mps2/fvp_sse300/device/source/system_core_init.c b/platform/ext/target/arm/mps2/fvp_sse300/device/source/system_core_init.c
index 99ef007b8b..99ef007b8b 100644
--- a/platform/ext/target/mps2/fvp_sse300/device/source/system_core_init.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/device/source/system_core_init.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c
index 23dbf50acf..23dbf50acf 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h
index 927d0a80d5..927d0a80d5 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c
index 0caa024679..0caa024679 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h
index de51999c36..de51999c36 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c
index 38d068d745..38d068d745 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h
index a3f7e1d700..a3f7e1d700 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c
index c7b4b153ac..c7b4b153ac 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h
index d14d2f79e2..d14d2f79e2 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c
index c3d1230052..c3d1230052 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c
diff --git a/platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h
index 2d3278ef65..2d3278ef65 100644
--- a/platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h
diff --git a/platform/ext/target/mps2/fvp_sse300/partition/flash_layout.h b/platform/ext/target/arm/mps2/fvp_sse300/partition/flash_layout.h
index 9fc1db0221..9fc1db0221 100644
--- a/platform/ext/target/mps2/fvp_sse300/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/partition/flash_layout.h
diff --git a/platform/ext/target/mps2/fvp_sse300/partition/platform_base_address.h b/platform/ext/target/arm/mps2/fvp_sse300/partition/platform_base_address.h
index c8bc75f523..c8bc75f523 100644
--- a/platform/ext/target/mps2/fvp_sse300/partition/platform_base_address.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/partition/platform_base_address.h
diff --git a/platform/ext/target/mps2/fvp_sse300/partition/region_defs.h b/platform/ext/target/arm/mps2/fvp_sse300/partition/region_defs.h
index 9f9d506161..9f9d506161 100644
--- a/platform/ext/target/mps2/fvp_sse300/partition/region_defs.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/partition/region_defs.h
diff --git a/platform/ext/target/mps2/fvp_sse300/plat_test.c b/platform/ext/target/arm/mps2/fvp_sse300/plat_test.c
index bdcbd48e49..bdcbd48e49 100644
--- a/platform/ext/target/mps2/fvp_sse300/plat_test.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/plat_test.c
diff --git a/platform/ext/target/mps2/fvp_sse300/preload.cmake b/platform/ext/target/arm/mps2/fvp_sse300/preload.cmake
index ae27ca9eb7..ae27ca9eb7 100644
--- a/platform/ext/target/mps2/fvp_sse300/preload.cmake
+++ b/platform/ext/target/arm/mps2/fvp_sse300/preload.cmake
diff --git a/platform/ext/target/mps2/fvp_sse300/services/src/tfm_platform_system.c b/platform/ext/target/arm/mps2/fvp_sse300/services/src/tfm_platform_system.c
index 44fafbccd1..44fafbccd1 100644
--- a/platform/ext/target/mps2/fvp_sse300/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/mps2/fvp_sse300/spm_hal.c b/platform/ext/target/arm/mps2/fvp_sse300/spm_hal.c
index 6b2d8a6d4e..6b2d8a6d4e 100644
--- a/platform/ext/target/mps2/fvp_sse300/spm_hal.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/spm_hal.c
diff --git a/platform/ext/target/mps2/fvp_sse300/target_cfg.c b/platform/ext/target/arm/mps2/fvp_sse300/target_cfg.c
index 7176616506..7176616506 100644
--- a/platform/ext/target/mps2/fvp_sse300/target_cfg.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/target_cfg.c
diff --git a/platform/ext/target/mps2/fvp_sse300/target_cfg.h b/platform/ext/target/arm/mps2/fvp_sse300/target_cfg.h
index 6a8c97e688..6a8c97e688 100644
--- a/platform/ext/target/mps2/fvp_sse300/target_cfg.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/target_cfg.h
diff --git a/platform/ext/target/mps2/fvp_sse300/tfm_hal_isolation.c b/platform/ext/target/arm/mps2/fvp_sse300/tfm_hal_isolation.c
index 4cbce30143..4cbce30143 100644
--- a/platform/ext/target/mps2/fvp_sse300/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/mps2/fvp_sse300/tfm_hal_isolation.c
diff --git a/platform/ext/target/mps2/fvp_sse300/tfm_peripherals_def.h b/platform/ext/target/arm/mps2/fvp_sse300/tfm_peripherals_def.h
index ae21ca2951..ae21ca2951 100644
--- a/platform/ext/target/mps2/fvp_sse300/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/mps2/fvp_sse300/tfm_peripherals_def.h
diff --git a/platform/ext/target/mps3/an524/CMakeLists.txt b/platform/ext/target/arm/mps3/an524/CMakeLists.txt
index e7244c4ffa..e7244c4ffa 100644
--- a/platform/ext/target/mps3/an524/CMakeLists.txt
+++ b/platform/ext/target/arm/mps3/an524/CMakeLists.txt
diff --git a/platform/ext/target/mps3/an524/boot_hal.c b/platform/ext/target/arm/mps3/an524/boot_hal.c
index 9e93972487..9e93972487 100644
--- a/platform/ext/target/mps3/an524/boot_hal.c
+++ b/platform/ext/target/arm/mps3/an524/boot_hal.c
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_Flash.c
index 0582300f8e..0582300f8e 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_MPC.c b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_MPC.c
index 5894ad863f..5894ad863f 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_MPC.c
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_MPC.c
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_PPC.c b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_PPC.c
index 9ffc35f51e..9ffc35f51e 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_PPC.c
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_PPC.c
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_USART.c
index f127e761a3..f127e761a3 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_USART.c
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/config/RTE_Device.h b/platform/ext/target/arm/mps3/an524/cmsis_drivers/config/RTE_Device.h
index 0f11064701..0f11064701 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/config/RTE_Device.h
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/config/RTE_Device.h
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h b/platform/ext/target/arm/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h
index 0644561e2e..0644561e2e 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h
diff --git a/platform/ext/target/mps3/an524/config.cmake b/platform/ext/target/arm/mps3/an524/config.cmake
index a1a74a5684..a1a74a5684 100644
--- a/platform/ext/target/mps3/an524/config.cmake
+++ b/platform/ext/target/arm/mps3/an524/config.cmake
diff --git a/platform/ext/target/mps3/an524/device/config/device_cfg.h b/platform/ext/target/arm/mps3/an524/device/config/device_cfg.h
index 29e992e82e..29e992e82e 100644
--- a/platform/ext/target/mps3/an524/device/config/device_cfg.h
+++ b/platform/ext/target/arm/mps3/an524/device/config/device_cfg.h
diff --git a/platform/ext/target/mps3/an524/device/include/cmsis.h b/platform/ext/target/arm/mps3/an524/device/include/cmsis.h
index 44068a101e..44068a101e 100644
--- a/platform/ext/target/mps3/an524/device/include/cmsis.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/cmsis.h
diff --git a/platform/ext/target/mps3/an524/device/include/device_definition.h b/platform/ext/target/arm/mps3/an524/device/include/device_definition.h
index a978ac9901..a978ac9901 100644
--- a/platform/ext/target/mps3/an524/device/include/device_definition.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/device_definition.h
diff --git a/platform/ext/target/mps3/an524/device/include/platform_base_address.h b/platform/ext/target/arm/mps3/an524/device/include/platform_base_address.h
index 52d4b36b92..52d4b36b92 100644
--- a/platform/ext/target/mps3/an524/device/include/platform_base_address.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/platform_base_address.h
diff --git a/platform/ext/target/mps3/an524/device/include/platform_description.h b/platform/ext/target/arm/mps3/an524/device/include/platform_description.h
index 85fc440507..85fc440507 100644
--- a/platform/ext/target/mps3/an524/device/include/platform_description.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/platform_description.h
diff --git a/platform/ext/target/mps3/an524/device/include/platform_irq.h b/platform/ext/target/arm/mps3/an524/device/include/platform_irq.h
index c84684c828..c84684c828 100644
--- a/platform/ext/target/mps3/an524/device/include/platform_irq.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/platform_irq.h
diff --git a/platform/ext/target/mps3/an524/device/include/platform_pins.h b/platform/ext/target/arm/mps3/an524/device/include/platform_pins.h
index e5fcfccab0..e5fcfccab0 100644
--- a/platform/ext/target/mps3/an524/device/include/platform_pins.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/platform_pins.h
diff --git a/platform/ext/target/mps3/an524/device/include/platform_regs.h b/platform/ext/target/arm/mps3/an524/device/include/platform_regs.h
index 1e5e92facd..1e5e92facd 100644
--- a/platform/ext/target/mps3/an524/device/include/platform_regs.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/platform_regs.h
diff --git a/platform/ext/target/mps3/an524/device/include/system_core_init.h b/platform/ext/target/arm/mps3/an524/device/include/system_core_init.h
index ab59ce554e..ab59ce554e 100644
--- a/platform/ext/target/mps3/an524/device/include/system_core_init.h
+++ b/platform/ext/target/arm/mps3/an524/device/include/system_core_init.h
diff --git a/platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_bl2.sct b/platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_bl2.sct
index 5426db88e7..5426db88e7 100644
--- a/platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_bl2.sct
+++ b/platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_bl2.sct
diff --git a/platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_ns.sct b/platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_ns.sct
index 55d9774ca8..55d9774ca8 100644
--- a/platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_ns.sct
+++ b/platform/ext/target/arm/mps3/an524/device/source/armclang/mps3_an524_ns.sct
diff --git a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s
index 98d325e0c5..98d325e0c5 100644
--- a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s
diff --git a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s
index 47d22cc911..47d22cc911 100644
--- a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s
diff --git a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s
index ff9a8d322a..ff9a8d322a 100644
--- a/platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s
diff --git a/platform/ext/target/mps3/an524/device/source/device_definition.c b/platform/ext/target/arm/mps3/an524/device/source/device_definition.c
index 6e3834b41d..6e3834b41d 100644
--- a/platform/ext/target/mps3/an524/device/source/device_definition.c
+++ b/platform/ext/target/arm/mps3/an524/device/source/device_definition.c
diff --git a/platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_bl2.ld b/platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_bl2.ld
index ce1ffc0997..ce1ffc0997 100644
--- a/platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_bl2.ld
+++ b/platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_bl2.ld
diff --git a/platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_ns.ld b/platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_ns.ld
index 9488ae899e..9488ae899e 100644
--- a/platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_ns.ld
+++ b/platform/ext/target/arm/mps3/an524/device/source/gcc/mps3_an524_ns.ld
diff --git a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S
index 93328a31c1..93328a31c1 100644
--- a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S
+++ b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S
diff --git a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S
index beac3cd4a2..beac3cd4a2 100644
--- a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S
+++ b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S
diff --git a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S
index b8fb9302f3..b8fb9302f3 100644
--- a/platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S
+++ b/platform/ext/target/arm/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S
diff --git a/platform/ext/target/mps3/an524/device/source/iar/mps3_an524_bl2.icf b/platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_bl2.icf
index aae828dc93..aae828dc93 100644
--- a/platform/ext/target/mps3/an524/device/source/iar/mps3_an524_bl2.icf
+++ b/platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_bl2.icf
diff --git a/platform/ext/target/mps3/an524/device/source/iar/mps3_an524_ns.icf b/platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_ns.icf
index 3eb9717d7d..3eb9717d7d 100644
--- a/platform/ext/target/mps3/an524/device/source/iar/mps3_an524_ns.icf
+++ b/platform/ext/target/arm/mps3/an524/device/source/iar/mps3_an524_ns.icf
diff --git a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s
index 164161c229..164161c229 100644
--- a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s
diff --git a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s
index 66f060d52b..66f060d52b 100644
--- a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s
diff --git a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s
index 855a7af8e9..855a7af8e9 100644
--- a/platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s
+++ b/platform/ext/target/arm/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s
diff --git a/platform/ext/target/mps3/an524/device/source/system_core_init.c b/platform/ext/target/arm/mps3/an524/device/source/system_core_init.c
index 9aba910742..9aba910742 100644
--- a/platform/ext/target/mps3/an524/device/source/system_core_init.c
+++ b/platform/ext/target/arm/mps3/an524/device/source/system_core_init.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.c b/platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.c
index b6dd8e99f3..b6dd8e99f3 100644
--- a/platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.c
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.h b/platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.h
index 998a5f1089..998a5f1089 100644
--- a/platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.h
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/mpc_sie200_drv.h
diff --git a/platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.c b/platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.c
index ad9efab9ce..ad9efab9ce 100644
--- a/platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.h b/platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.h
index d427604f38..d427604f38 100644
--- a/platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/mpu_armv8m_drv.h
diff --git a/platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.c b/platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.c
index dda05506db..dda05506db 100644
--- a/platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.c
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.h b/platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.h
index 7a08a8f9fe..7a08a8f9fe 100644
--- a/platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.h
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/ppc_sse200_drv.h
diff --git a/platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.c b/platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.c
index b051909b29..b051909b29 100644
--- a/platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.c
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.h b/platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.h
index a374e63b0d..a374e63b0d 100644
--- a/platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.h
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/timer_cmsdk_drv.h
diff --git a/platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.c b/platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.c
index c3d1230052..c3d1230052 100644
--- a/platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.c
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.c
diff --git a/platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.h b/platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.h
index 2d3278ef65..2d3278ef65 100644
--- a/platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.h
+++ b/platform/ext/target/arm/mps3/an524/native_drivers/uart_cmsdk_drv.h
diff --git a/platform/ext/target/mps3/an524/partition/flash_layout.h b/platform/ext/target/arm/mps3/an524/partition/flash_layout.h
index 35e7d1e20e..35e7d1e20e 100644
--- a/platform/ext/target/mps3/an524/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/an524/partition/flash_layout.h
diff --git a/platform/ext/target/mps3/an524/partition/region_defs.h b/platform/ext/target/arm/mps3/an524/partition/region_defs.h
index 089a3b72e0..089a3b72e0 100644
--- a/platform/ext/target/mps3/an524/partition/region_defs.h
+++ b/platform/ext/target/arm/mps3/an524/partition/region_defs.h
diff --git a/platform/ext/target/mps3/an524/plat_test.c b/platform/ext/target/arm/mps3/an524/plat_test.c
index cdfcfa209c..cdfcfa209c 100644
--- a/platform/ext/target/mps3/an524/plat_test.c
+++ b/platform/ext/target/arm/mps3/an524/plat_test.c
diff --git a/platform/ext/target/mps3/an524/preload.cmake b/platform/ext/target/arm/mps3/an524/preload.cmake
index 436fed7203..436fed7203 100644
--- a/platform/ext/target/mps3/an524/preload.cmake
+++ b/platform/ext/target/arm/mps3/an524/preload.cmake
diff --git a/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c b/platform/ext/target/arm/mps3/an524/services/src/tfm_platform_system.c
index aa77e5d968..aa77e5d968 100644
--- a/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/mps3/an524/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/mps3/an524/spm_hal.c b/platform/ext/target/arm/mps3/an524/spm_hal.c
index 8abe9d8a50..8abe9d8a50 100644
--- a/platform/ext/target/mps3/an524/spm_hal.c
+++ b/platform/ext/target/arm/mps3/an524/spm_hal.c
diff --git a/platform/ext/target/mps3/an524/target_cfg.c b/platform/ext/target/arm/mps3/an524/target_cfg.c
index 0648984c4f..0648984c4f 100644
--- a/platform/ext/target/mps3/an524/target_cfg.c
+++ b/platform/ext/target/arm/mps3/an524/target_cfg.c
diff --git a/platform/ext/target/mps3/an524/target_cfg.h b/platform/ext/target/arm/mps3/an524/target_cfg.h
index 8246b7aca1..8246b7aca1 100644
--- a/platform/ext/target/mps3/an524/target_cfg.h
+++ b/platform/ext/target/arm/mps3/an524/target_cfg.h
diff --git a/platform/ext/target/mps3/an524/tfm_hal_isolation.c b/platform/ext/target/arm/mps3/an524/tfm_hal_isolation.c
index 0f27cba968..0f27cba968 100644
--- a/platform/ext/target/mps3/an524/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/mps3/an524/tfm_hal_isolation.c
diff --git a/platform/ext/target/mps3/an524/tfm_peripherals_def.h b/platform/ext/target/arm/mps3/an524/tfm_peripherals_def.h
index 643046cd03..643046cd03 100644
--- a/platform/ext/target/mps3/an524/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/mps3/an524/tfm_peripherals_def.h
diff --git a/platform/ext/target/mps3/an547/CMakeLists.txt b/platform/ext/target/arm/mps3/an547/CMakeLists.txt
index 51e36bed21..51e36bed21 100644
--- a/platform/ext/target/mps3/an547/CMakeLists.txt
+++ b/platform/ext/target/arm/mps3/an547/CMakeLists.txt
diff --git a/platform/ext/target/mps3/an547/README.rst b/platform/ext/target/arm/mps3/an547/README.rst
index 6760ef6965..6760ef6965 100644
--- a/platform/ext/target/mps3/an547/README.rst
+++ b/platform/ext/target/arm/mps3/an547/README.rst
diff --git a/platform/ext/target/mps3/an547/boot_hal.c b/platform/ext/target/arm/mps3/an547/boot_hal.c
index 9e93972487..9e93972487 100644
--- a/platform/ext/target/mps3/an547/boot_hal.c
+++ b/platform/ext/target/arm/mps3/an547/boot_hal.c
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c
index 4b24631f79..4b24631f79 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_Flash.c
index 06d3546f03..06d3546f03 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c
index c16cc4aa0a..c16cc4aa0a 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h
index c07fed07f4..c07fed07f4 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_USART.c
index cb3a14ad3e..cb3a14ad3e 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/Driver_USART.c
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/config/RTE_Device.h b/platform/ext/target/arm/mps3/an547/cmsis_drivers/config/RTE_Device.h
index ef808ce670..ef808ce670 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/config/RTE_Device.h
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/config/RTE_Device.h
diff --git a/platform/ext/target/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h b/platform/ext/target/arm/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h
index edc4633a2d..edc4633a2d 100644
--- a/platform/ext/target/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h
diff --git a/platform/ext/target/mps3/an547/config.cmake b/platform/ext/target/arm/mps3/an547/config.cmake
index a81c8a1137..a81c8a1137 100644
--- a/platform/ext/target/mps3/an547/config.cmake
+++ b/platform/ext/target/arm/mps3/an547/config.cmake
diff --git a/platform/ext/target/mps3/an547/device/config/device_cfg.h b/platform/ext/target/arm/mps3/an547/device/config/device_cfg.h
index 33a2b90a70..33a2b90a70 100644
--- a/platform/ext/target/mps3/an547/device/config/device_cfg.h
+++ b/platform/ext/target/arm/mps3/an547/device/config/device_cfg.h
diff --git a/platform/ext/target/mps3/an547/device/include/cmsis.h b/platform/ext/target/arm/mps3/an547/device/include/cmsis.h
index dbd93f43d8..dbd93f43d8 100644
--- a/platform/ext/target/mps3/an547/device/include/cmsis.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/cmsis.h
diff --git a/platform/ext/target/mps3/an547/device/include/device_definition.h b/platform/ext/target/arm/mps3/an547/device/include/device_definition.h
index 754f8dd159..754f8dd159 100644
--- a/platform/ext/target/mps3/an547/device/include/device_definition.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/device_definition.h
diff --git a/platform/ext/target/mps3/an547/device/include/platform_description.h b/platform/ext/target/arm/mps3/an547/device/include/platform_description.h
index 6800c05577..6800c05577 100644
--- a/platform/ext/target/mps3/an547/device/include/platform_description.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/platform_description.h
diff --git a/platform/ext/target/mps3/an547/device/include/platform_irq.h b/platform/ext/target/arm/mps3/an547/device/include/platform_irq.h
index ae706ba5c6..ae706ba5c6 100644
--- a/platform/ext/target/mps3/an547/device/include/platform_irq.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/platform_irq.h
diff --git a/platform/ext/target/mps3/an547/device/include/platform_pins.h b/platform/ext/target/arm/mps3/an547/device/include/platform_pins.h
index f5eda8cef3..f5eda8cef3 100644
--- a/platform/ext/target/mps3/an547/device/include/platform_pins.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/platform_pins.h
diff --git a/platform/ext/target/mps3/an547/device/include/platform_regs.h b/platform/ext/target/arm/mps3/an547/device/include/platform_regs.h
index 696d95f392..696d95f392 100644
--- a/platform/ext/target/mps3/an547/device/include/platform_regs.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/platform_regs.h
diff --git a/platform/ext/target/mps3/an547/device/include/system_core_init.h b/platform/ext/target/arm/mps3/an547/device/include/system_core_init.h
index feba5e9aa0..feba5e9aa0 100644
--- a/platform/ext/target/mps3/an547/device/include/system_core_init.h
+++ b/platform/ext/target/arm/mps3/an547/device/include/system_core_init.h
diff --git a/platform/ext/target/mps3/an547/device/source/armclang/an547_bl2.sct b/platform/ext/target/arm/mps3/an547/device/source/armclang/an547_bl2.sct
index 1f6a34aff3..1f6a34aff3 100644
--- a/platform/ext/target/mps3/an547/device/source/armclang/an547_bl2.sct
+++ b/platform/ext/target/arm/mps3/an547/device/source/armclang/an547_bl2.sct
diff --git a/platform/ext/target/mps3/an547/device/source/armclang/an547_ns.sct b/platform/ext/target/arm/mps3/an547/device/source/armclang/an547_ns.sct
index 92707b9ce5..92707b9ce5 100644
--- a/platform/ext/target/mps3/an547/device/source/armclang/an547_ns.sct
+++ b/platform/ext/target/arm/mps3/an547/device/source/armclang/an547_ns.sct
diff --git a/platform/ext/target/mps3/an547/device/source/device_definition.c b/platform/ext/target/arm/mps3/an547/device/source/device_definition.c
index 4a18c1c82f..4a18c1c82f 100644
--- a/platform/ext/target/mps3/an547/device/source/device_definition.c
+++ b/platform/ext/target/arm/mps3/an547/device/source/device_definition.c
diff --git a/platform/ext/target/mps3/an547/device/source/startup_an547_bl2.c b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_bl2.c
index b64ffa044d..b64ffa044d 100644
--- a/platform/ext/target/mps3/an547/device/source/startup_an547_bl2.c
+++ b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_bl2.c
diff --git a/platform/ext/target/mps3/an547/device/source/startup_an547_ns.c b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_ns.c
index 4118c53838..4118c53838 100644
--- a/platform/ext/target/mps3/an547/device/source/startup_an547_ns.c
+++ b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_ns.c
diff --git a/platform/ext/target/mps3/an547/device/source/startup_an547_s.c b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_s.c
index 66d6ce1445..66d6ce1445 100644
--- a/platform/ext/target/mps3/an547/device/source/startup_an547_s.c
+++ b/platform/ext/target/arm/mps3/an547/device/source/startup_an547_s.c
diff --git a/platform/ext/target/mps3/an547/device/source/system_core_init.c b/platform/ext/target/arm/mps3/an547/device/source/system_core_init.c
index 6fe49b3259..6fe49b3259 100644
--- a/platform/ext/target/mps3/an547/device/source/system_core_init.c
+++ b/platform/ext/target/arm/mps3/an547/device/source/system_core_init.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.c
index 23dbf50acf..23dbf50acf 100644
--- a/platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.h
index 927d0a80d5..927d0a80d5 100644
--- a/platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/mpc_sie_drv.h
diff --git a/platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.c
index 0caa024679..0caa024679 100644
--- a/platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.h
index de51999c36..de51999c36 100644
--- a/platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/mpu_armv8m_drv.h
diff --git a/platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.c
index 38d068d745..38d068d745 100644
--- a/platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.h
index a3f7e1d700..a3f7e1d700 100644
--- a/platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/ppc_sse300_drv.h
diff --git a/platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c
index 832bb0292f..832bb0292f 100644
--- a/platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h
index e84786d23c..e84786d23c 100644
--- a/platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h
diff --git a/platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.c
index c7b4b153ac..c7b4b153ac 100644
--- a/platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.h
index d14d2f79e2..d14d2f79e2 100644
--- a/platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/systimer_armv8-m_drv.h
diff --git a/platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.c b/platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.c
index c3d1230052..c3d1230052 100644
--- a/platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.c
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.c
diff --git a/platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.h b/platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.h
index 2d3278ef65..2d3278ef65 100644
--- a/platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.h
+++ b/platform/ext/target/arm/mps3/an547/native_drivers/uart_cmsdk_drv.h
diff --git a/platform/ext/target/mps3/an547/partition/flash_layout.h b/platform/ext/target/arm/mps3/an547/partition/flash_layout.h
index a571b07adb..a571b07adb 100644
--- a/platform/ext/target/mps3/an547/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/an547/partition/flash_layout.h
diff --git a/platform/ext/target/mps3/an547/partition/platform_base_address.h b/platform/ext/target/arm/mps3/an547/partition/platform_base_address.h
index ba39235567..ba39235567 100644
--- a/platform/ext/target/mps3/an547/partition/platform_base_address.h
+++ b/platform/ext/target/arm/mps3/an547/partition/platform_base_address.h
diff --git a/platform/ext/target/mps3/an547/partition/region_defs.h b/platform/ext/target/arm/mps3/an547/partition/region_defs.h
index bf747de855..bf747de855 100644
--- a/platform/ext/target/mps3/an547/partition/region_defs.h
+++ b/platform/ext/target/arm/mps3/an547/partition/region_defs.h
diff --git a/platform/ext/target/mps3/an547/plat_test.c b/platform/ext/target/arm/mps3/an547/plat_test.c
index 12bd4372e0..12bd4372e0 100644
--- a/platform/ext/target/mps3/an547/plat_test.c
+++ b/platform/ext/target/arm/mps3/an547/plat_test.c
diff --git a/platform/ext/target/mps3/an547/preload.cmake b/platform/ext/target/arm/mps3/an547/preload.cmake
index ae27ca9eb7..ae27ca9eb7 100644
--- a/platform/ext/target/mps3/an547/preload.cmake
+++ b/platform/ext/target/arm/mps3/an547/preload.cmake
diff --git a/platform/ext/target/mps3/an547/services/src/tfm_platform_system.c b/platform/ext/target/arm/mps3/an547/services/src/tfm_platform_system.c
index 44fafbccd1..44fafbccd1 100644
--- a/platform/ext/target/mps3/an547/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/mps3/an547/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/mps3/an547/spm_hal.c b/platform/ext/target/arm/mps3/an547/spm_hal.c
index 840deac1ba..840deac1ba 100644
--- a/platform/ext/target/mps3/an547/spm_hal.c
+++ b/platform/ext/target/arm/mps3/an547/spm_hal.c
diff --git a/platform/ext/target/mps3/an547/target_cfg.c b/platform/ext/target/arm/mps3/an547/target_cfg.c
index ef9c023b4d..ef9c023b4d 100644
--- a/platform/ext/target/mps3/an547/target_cfg.c
+++ b/platform/ext/target/arm/mps3/an547/target_cfg.c
diff --git a/platform/ext/target/mps3/an547/target_cfg.h b/platform/ext/target/arm/mps3/an547/target_cfg.h
index 6f0e4f833e..6f0e4f833e 100644
--- a/platform/ext/target/mps3/an547/target_cfg.h
+++ b/platform/ext/target/arm/mps3/an547/target_cfg.h
diff --git a/platform/ext/target/mps3/an547/tfm_hal_isolation.c b/platform/ext/target/arm/mps3/an547/tfm_hal_isolation.c
index 419ad0fe07..419ad0fe07 100644
--- a/platform/ext/target/mps3/an547/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/mps3/an547/tfm_hal_isolation.c
diff --git a/platform/ext/target/mps3/an547/tfm_peripherals_def.h b/platform/ext/target/arm/mps3/an547/tfm_peripherals_def.h
index 1c00be592d..1c00be592d 100644
--- a/platform/ext/target/mps3/an547/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/mps3/an547/tfm_peripherals_def.h
diff --git a/platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c b/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c
index c929e7e0ed..c929e7e0ed 100644
--- a/platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c
+++ b/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c
diff --git a/platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c b/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c
index 195cb80ac5..195cb80ac5 100644
--- a/platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c
+++ b/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c
diff --git a/platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.c b/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.c
index 578cc5b376..578cc5b376 100644
--- a/platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.c
+++ b/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.c
diff --git a/platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.h b/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.h
index c2dac2ca21..c2dac2ca21 100644
--- a/platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.h
+++ b/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.h
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.c b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.c
index b8bf522c9f..b8bf522c9f 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.c
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.c
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.h b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.h
index b4d6cfbc76..b4d6cfbc76 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.h
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.h
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_process_spec_api.h b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_process_spec_api.h
index 723ea25dde..723ea25dde 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/gfc100_process_spec_api.h
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_process_spec_api.h
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.c b/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.c
index b228c3f195..b228c3f195 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.c
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.c
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.h b/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.h
index 08e0dd3b2e..08e0dd3b2e 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.h
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.h
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c b/platform/ext/target/arm/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c
index ccfde9ce39..ccfde9ce39 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c b/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c
index bb13a4219b..bb13a4219b 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c
diff --git a/platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h b/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h
index 69929255dd..69929255dd 100644
--- a/platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h
+++ b/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h
diff --git a/platform/ext/target/musca_b1/generated_file_list.yaml b/platform/ext/target/arm/musca_b1/generated_file_list.yaml
index ff01824220..ff01824220 100644
--- a/platform/ext/target/musca_b1/generated_file_list.yaml
+++ b/platform/ext/target/arm/musca_b1/generated_file_list.yaml
diff --git a/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h
index 6303551db1..6303551db1 100644
--- a/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h b/platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h
index b633da37b2..b633da37b2 100644
--- a/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt b/platform/ext/target/arm/musca_b1/secure_enclave/CMakeLists.txt
index 961a000e5e..961a000e5e 100644
--- a/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/CMakeLists.txt
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Config/device_cfg.h
index b093b19521..b093b19521 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Config/device_cfg.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Config/device_cfg.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/cmsis.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/cmsis.h
index 97e5643672..97e5643672 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/cmsis.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/cmsis.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/device_definition.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/device_definition.h
index 2f1c02e99a..2f1c02e99a 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/device_definition.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/device_definition.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_base_address.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_base_address.h
index a0ee419a47..a0ee419a47 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_base_address.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_base_address.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_description.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_description.h
index 6ea03bacd7..6ea03bacd7 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_description.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_description.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_irq.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_irq.h
index a5df3f7dc7..a5df3f7dc7 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_irq.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/platform_irq.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Include/system_core_init.h b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/system_core_init.h
index 8f4d33c434..8f4d33c434 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Include/system_core_init.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Include/system_core_init.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct
index 430dd79f64..430dd79f64 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s
index dd92be5d93..dd92be5d93 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s
index 27f1b1778c..27f1b1778c 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/device_definition.c b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/device_definition.c
index 192400c76e..192400c76e 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/device_definition.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/device_definition.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld
index d614fb1776..d614fb1776 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S
index a124c46d11..a124c46d11 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S
index bd4c1d9568..bd4c1d9568 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S
diff --git a/platform/ext/target/musca_b1/secure_enclave/Device/Source/system_core_init.c b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/system_core_init.c
index 2c45fd7fee..2c45fd7fee 100644
--- a/platform/ext/target/musca_b1/secure_enclave/Device/Source/system_core_init.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/Device/Source/system_core_init.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/boot_hal.c b/platform/ext/target/arm/musca_b1/secure_enclave/boot_hal.c
index 5673bd014b..5673bd014b 100644
--- a/platform/ext/target/musca_b1/secure_enclave/boot_hal.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/boot_hal.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/config.cmake b/platform/ext/target/arm/musca_b1/secure_enclave/config.cmake
index 34c3058bb7..34c3058bb7 100644
--- a/platform/ext/target/musca_b1/secure_enclave/config.cmake
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/config.cmake
diff --git a/platform/ext/target/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c
index 283d3bb22a..283d3bb22a 100644
--- a/platform/ext/target/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.c b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.c
index e568449823..e568449823 100644
--- a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.h b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.h
index c8e5871692..c8e5871692 100644
--- a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_multicore.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c
index 1ccdfcea37..1ccdfcea37 100644
--- a/platform/ext/target/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/partition/flash_layout.h b/platform/ext/target/arm/musca_b1/secure_enclave/partition/flash_layout.h
index 10c131b280..10c131b280 100644
--- a/platform/ext/target/musca_b1/secure_enclave/partition/flash_layout.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/partition/flash_layout.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/partition/region_defs.h b/platform/ext/target/arm/musca_b1/secure_enclave/partition/region_defs.h
index 3f8a18e02f..3f8a18e02f 100644
--- a/platform/ext/target/musca_b1/secure_enclave/partition/region_defs.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/partition/region_defs.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/preload.cmake b/platform/ext/target/arm/musca_b1/secure_enclave/preload.cmake
index f334999679..f334999679 100644
--- a/platform/ext/target/musca_b1/secure_enclave/preload.cmake
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/preload.cmake
diff --git a/platform/ext/target/musca_b1/secure_enclave/preload_ns.cmake b/platform/ext/target/arm/musca_b1/secure_enclave/preload_ns.cmake
index 3b9601fc18..3b9601fc18 100644
--- a/platform/ext/target/musca_b1/secure_enclave/preload_ns.cmake
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/preload_ns.cmake
diff --git a/platform/ext/target/musca_b1/secure_enclave/readme.rst b/platform/ext/target/arm/musca_b1/secure_enclave/readme.rst
index a9af495776..c878a0d6c8 100644
--- a/platform/ext/target/musca_b1/secure_enclave/readme.rst
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/readme.rst
@@ -65,10 +65,11 @@ To produce all the images, TF-M build needs to be executed twice:
- One build needed to create the SSE-200 images (BL0 and the combined SSE-200
image containing TF-M and the non-secure application), target platform needs
- to be set to ``musca_b1/sse_200`` and the ``FORWARD_PROT_MSG`` cmake flag also
+ to be set to ``arm/musca_b1/sse_200`` and the ``FORWARD_PROT_MSG`` cmake flag
+ also
needs to be set.
- One build needed to create the SE images (MCUBoot and TF-M), target platform
- needs to be set to ``musca_b1/secure_enclave``.
+ needs to be set to ``arm/musca_b1/secure_enclave``.
The order of the two builds is indifferent. The BL2 setting is mandatory for
both builds, but MCUBoot image is only built for the SE platform. The cmake
diff --git a/platform/ext/target/musca_b1/secure_enclave/services/src/tfm_platform_system.c b/platform/ext/target/arm/musca_b1/secure_enclave/services/src/tfm_platform_system.c
index 283af84758..283af84758 100644
--- a/platform/ext/target/musca_b1/secure_enclave/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/spm_hal.c b/platform/ext/target/arm/musca_b1/secure_enclave/spm_hal.c
index b80007853c..b80007853c 100644
--- a/platform/ext/target/musca_b1/secure_enclave/spm_hal.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/spm_hal.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/target_cfg.c b/platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.c
index c1986ae163..c1986ae163 100644
--- a/platform/ext/target/musca_b1/secure_enclave/target_cfg.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/target_cfg.h b/platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.h
index eccde5861f..eccde5861f 100644
--- a/platform/ext/target/musca_b1/secure_enclave/target_cfg.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/target_cfg.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/tfm_hal_isolation.c b/platform/ext/target/arm/musca_b1/secure_enclave/tfm_hal_isolation.c
index e120795e7f..e120795e7f 100644
--- a/platform/ext/target/musca_b1/secure_enclave/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/tfm_hal_isolation.c
diff --git a/platform/ext/target/musca_b1/secure_enclave/tfm_peripherals_def.h b/platform/ext/target/arm/musca_b1/secure_enclave/tfm_peripherals_def.h
index 6775553b09..6775553b09 100644
--- a/platform/ext/target/musca_b1/secure_enclave/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/tfm_peripherals_def.h
diff --git a/platform/ext/target/musca_b1/secure_enclave/uart_stdout.c b/platform/ext/target/arm/musca_b1/secure_enclave/uart_stdout.c
index 48ef7b94b5..48ef7b94b5 100644
--- a/platform/ext/target/musca_b1/secure_enclave/uart_stdout.c
+++ b/platform/ext/target/arm/musca_b1/secure_enclave/uart_stdout.c
diff --git a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
index ddef239c25..ddef239c25 100644
--- a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
diff --git a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
index f3b342961e..f3b342961e 100644
--- a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
index 7e94f88d43..7e94f88d43 100644
--- a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
diff --git a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
index efadb04da5..efadb04da5 100644
--- a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
diff --git a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
index fe25126b78..fe25126b78 100644
--- a/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
diff --git a/platform/ext/target/musca_b1/sse_200/CMakeLists.txt b/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
index 0b8d97d69a..0b8d97d69a 100644
--- a/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Config/device_cfg.h
index d34a29e61c..d34a29e61c 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Config/device_cfg.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/cmsis.h
index 4e08300fb1..4e08300fb1 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/cmsis.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/device_definition.h
index 6558088871..6558088871 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/device_definition.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_base_address.h
index 96e2112ffc..96e2112ffc 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_base_address.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_description.h
index e5760c76f6..e5760c76f6 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_description.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_irq.h
index 4705262cef..4705262cef 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_irq.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_pins.h
index 34c5a3c594..34c5a3c594 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_pins.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_regs.h
index f9b8ee2517..f9b8ee2517 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_regs.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/system_core_init.h
index d751735971..d751735971 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Include/system_core_init.h
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
index c1bdecf4d7..c1bdecf4d7 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
index f5d3bd9a34..f5d3bd9a34 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
index ea7d5e1fd4..ea7d5e1fd4 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
index 9241cf4c35..9241cf4c35 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
index 0c70983e9b..0c70983e9b 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
index fe00a7f57d..fe00a7f57d 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/device_definition.c
index 2b6e726c04..2b6e726c04 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/device_definition.c
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
index 01bb980d0f..01bb980d0f 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
index e3dbe6ce00..e3dbe6ce00 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
index 7bfa50b810..7bfa50b810 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
index 82a57b24a8..82a57b24a8 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
index b60421c705..b60421c705 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
index 639ce0b74d..639ce0b74d 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
diff --git a/platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/system_core_init.c
index df44472dcd..df44472dcd 100644
--- a/platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Device/Source/system_core_init.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
index 70260697c1..70260697c1 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
index 2671cc4abe..2671cc4abe 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
index 00dfa862c6..00dfa862c6 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
index a691e78990..a691e78990 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
index ad9efab9ce..ad9efab9ce 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
index d427604f38..d427604f38 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
index 73f0c6463f..73f0c6463f 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
index 8983178ef2..8983178ef2 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
index 40cf65052f..40cf65052f 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
index 2008b1af52..2008b1af52 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
index f4d477b290..f4d477b290 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
index c31135da54..c31135da54 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
index 01feaa4fdd..01feaa4fdd 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
diff --git a/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
index dcae737a92..dcae737a92 100644
--- a/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
diff --git a/platform/ext/target/musca_b1/sse_200/attest_hal.c b/platform/ext/target/arm/musca_b1/sse_200/attest_hal.c
index 8f746446a2..8f746446a2 100644
--- a/platform/ext/target/musca_b1/sse_200/attest_hal.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/attest_hal.c
diff --git a/platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt b/platform/ext/target/arm/musca_b1/sse_200/bl0/CMakeLists.txt
index a8998be8d2..a8998be8d2 100644
--- a/platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_b1/sse_200/bl0/CMakeLists.txt
diff --git a/platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c b/platform/ext/target/arm/musca_b1/sse_200/bl0/bl0_main.c
index bd38017d66..bd38017d66 100644
--- a/platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/bl0/bl0_main.c
diff --git a/platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h b/platform/ext/target/arm/musca_b1/sse_200/bl0/device_cfg.h
index eb1fe75201..eb1fe75201 100644
--- a/platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/bl0/device_cfg.h
diff --git a/platform/ext/target/musca_b1/sse_200/boot_hal.c b/platform/ext/target/arm/musca_b1/sse_200/boot_hal.c
index ad9da135f9..ad9da135f9 100644
--- a/platform/ext/target/musca_b1/sse_200/boot_hal.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/boot_hal.c
diff --git a/platform/ext/target/musca_b1/sse_200/config.cmake b/platform/ext/target/arm/musca_b1/sse_200/config.cmake
index 13fb636650..61f6c15933 100644
--- a/platform/ext/target/musca_b1/sse_200/config.cmake
+++ b/platform/ext/target/arm/musca_b1/sse_200/config.cmake
@@ -34,6 +34,6 @@ else()
set(BL0 ON)
endif()
-set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/target/musca_b1/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE)
+set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/target/arm/musca_b1/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE)
set(PSA_API_TEST_TARGET "musca_b1" CACHE STRING "Target to use when building the PSA API tests")
diff --git a/platform/ext/target/musca_b1/sse_200/crypto_keys.c b/platform/ext/target/arm/musca_b1/sse_200/crypto_keys.c
index c786190078..c786190078 100644
--- a/platform/ext/target/musca_b1/sse_200/crypto_keys.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/crypto_keys.c
diff --git a/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.c
index 1c482d70a2..1c482d70a2 100644
--- a/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.c
diff --git a/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.h
index cd6fa9a962..cd6fa9a962 100644
--- a/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_multicore.h
diff --git a/platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
index 1b25412e1b..1b25412e1b 100644
--- a/platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
diff --git a/platform/ext/target/musca_b1/sse_200/partition/flash_layout.h b/platform/ext/target/arm/musca_b1/sse_200/partition/flash_layout.h
index 16f91fecba..16f91fecba 100644
--- a/platform/ext/target/musca_b1/sse_200/partition/flash_layout.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/partition/flash_layout.h
diff --git a/platform/ext/target/musca_b1/sse_200/partition/region_defs.h b/platform/ext/target/arm/musca_b1/sse_200/partition/region_defs.h
index 2d9f06f297..2d9f06f297 100644
--- a/platform/ext/target/musca_b1/sse_200/partition/region_defs.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/partition/region_defs.h
diff --git a/platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h b/platform/ext/target/arm/musca_b1/sse_200/partition/region_defs_bl0.h
index 9654cc8cc1..9654cc8cc1 100644
--- a/platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/partition/region_defs_bl0.h
diff --git a/platform/ext/target/musca_b1/sse_200/plat_test.c b/platform/ext/target/arm/musca_b1/sse_200/plat_test.c
index cdfcfa209c..cdfcfa209c 100644
--- a/platform/ext/target/musca_b1/sse_200/plat_test.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/plat_test.c
diff --git a/platform/ext/target/musca_b1/sse_200/preload.cmake b/platform/ext/target/arm/musca_b1/sse_200/preload.cmake
index d641b42fcc..d641b42fcc 100644
--- a/platform/ext/target/musca_b1/sse_200/preload.cmake
+++ b/platform/ext/target/arm/musca_b1/sse_200/preload.cmake
diff --git a/platform/ext/target/musca_b1/sse_200/readme.rst b/platform/ext/target/arm/musca_b1/sse_200/readme.rst
index e81b96e7e6..e81b96e7e6 100644
--- a/platform/ext/target/musca_b1/sse_200/readme.rst
+++ b/platform/ext/target/arm/musca_b1/sse_200/readme.rst
diff --git a/platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h b/platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_ioctl_api.h
index b391bf6eed..b391bf6eed 100644
--- a/platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_ioctl_api.h
diff --git a/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
index 31b6e86b8e..31b6e86b8e 100644
--- a/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
diff --git a/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
index b191305f4c..b191305f4c 100644
--- a/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
diff --git a/platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_platform_system.c
index 44b5b92480..44b5b92480 100644
--- a/platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/musca_b1/sse_200/spm_hal.c b/platform/ext/target/arm/musca_b1/sse_200/spm_hal.c
index 42c10cffe2..42c10cffe2 100644
--- a/platform/ext/target/musca_b1/sse_200/spm_hal.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/spm_hal.c
diff --git a/platform/ext/target/musca_b1/sse_200/target_cfg.c b/platform/ext/target/arm/musca_b1/sse_200/target_cfg.c
index 89f44d0f58..89f44d0f58 100644
--- a/platform/ext/target/musca_b1/sse_200/target_cfg.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/target_cfg.c
diff --git a/platform/ext/target/musca_b1/sse_200/target_cfg.h b/platform/ext/target/arm/musca_b1/sse_200/target_cfg.h
index fba2b4f768..fba2b4f768 100644
--- a/platform/ext/target/musca_b1/sse_200/target_cfg.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/target_cfg.h
diff --git a/platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c b/platform/ext/target/arm/musca_b1/sse_200/tfm_hal_isolation.c
index d4d2f54887..d4d2f54887 100644
--- a/platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/musca_b1/sse_200/tfm_hal_isolation.c
diff --git a/platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h b/platform/ext/target/arm/musca_b1/sse_200/tfm_peripherals_def.h
index a0887ac917..a0887ac917 100644
--- a/platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/musca_b1/sse_200/tfm_peripherals_def.h
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/RTE_Device.h
index 8fb06312d9..8fb06312d9 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Config/RTE_Device.h
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/RTE_Device.h
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h
index 2a8c723b12..2a8c723b12 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c
index 5d80a769bf..5d80a769bf 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_MPC.c b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_MPC.c
index f89b25c1a8..f89b25c1a8 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_MPC.c
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_MPC.c
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_PPC.c b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_PPC.c
index efadb04da5..efadb04da5 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_PPC.c
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_PPC.c
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c
index 440ba94914..440ba94914 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c
diff --git a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_USART.c b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_USART.c
index cdd5a6c953..cdd5a6c953 100644
--- a/platform/ext/target/musca_s1/CMSIS_Driver/Driver_USART.c
+++ b/platform/ext/target/arm/musca_s1/CMSIS_Driver/Driver_USART.c
diff --git a/platform/ext/target/musca_s1/CMakeLists.txt b/platform/ext/target/arm/musca_s1/CMakeLists.txt
index 4d07d5342b..4d07d5342b 100644
--- a/platform/ext/target/musca_s1/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_s1/CMakeLists.txt
diff --git a/platform/ext/target/musca_s1/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_s1/Device/Config/device_cfg.h
index 7f9dae1605..7f9dae1605 100644
--- a/platform/ext/target/musca_s1/Device/Config/device_cfg.h
+++ b/platform/ext/target/arm/musca_s1/Device/Config/device_cfg.h
diff --git a/platform/ext/target/musca_s1/Device/Include/cmsis.h b/platform/ext/target/arm/musca_s1/Device/Include/cmsis.h
index e5669cbafe..e5669cbafe 100644
--- a/platform/ext/target/musca_s1/Device/Include/cmsis.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/cmsis.h
diff --git a/platform/ext/target/musca_s1/Device/Include/device_definition.h b/platform/ext/target/arm/musca_s1/Device/Include/device_definition.h
index b0a7828d98..b0a7828d98 100644
--- a/platform/ext/target/musca_s1/Device/Include/device_definition.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/device_definition.h
diff --git a/platform/ext/target/musca_s1/Device/Include/platform_base_address.h b/platform/ext/target/arm/musca_s1/Device/Include/platform_base_address.h
index 8269603c93..8269603c93 100644
--- a/platform/ext/target/musca_s1/Device/Include/platform_base_address.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/platform_base_address.h
diff --git a/platform/ext/target/musca_s1/Device/Include/platform_description.h b/platform/ext/target/arm/musca_s1/Device/Include/platform_description.h
index e5760c76f6..e5760c76f6 100644
--- a/platform/ext/target/musca_s1/Device/Include/platform_description.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/platform_description.h
diff --git a/platform/ext/target/musca_s1/Device/Include/platform_irq.h b/platform/ext/target/arm/musca_s1/Device/Include/platform_irq.h
index 886f0379f4..886f0379f4 100644
--- a/platform/ext/target/musca_s1/Device/Include/platform_irq.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/platform_irq.h
diff --git a/platform/ext/target/musca_s1/Device/Include/platform_pins.h b/platform/ext/target/arm/musca_s1/Device/Include/platform_pins.h
index f3e406aa23..f3e406aa23 100644
--- a/platform/ext/target/musca_s1/Device/Include/platform_pins.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/platform_pins.h
diff --git a/platform/ext/target/musca_s1/Device/Include/platform_regs.h b/platform/ext/target/arm/musca_s1/Device/Include/platform_regs.h
index b6d29a2d13..b6d29a2d13 100644
--- a/platform/ext/target/musca_s1/Device/Include/platform_regs.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/platform_regs.h
diff --git a/platform/ext/target/musca_s1/Device/Include/system_core_init.h b/platform/ext/target/arm/musca_s1/Device/Include/system_core_init.h
index 71005db203..71005db203 100644
--- a/platform/ext/target/musca_s1/Device/Include/system_core_init.h
+++ b/platform/ext/target/arm/musca_s1/Device/Include/system_core_init.h
diff --git a/platform/ext/target/musca_s1/Device/Source/armclang/musca_bl2.sct b/platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_bl2.sct
index 29f1341eb1..29f1341eb1 100644
--- a/platform/ext/target/musca_s1/Device/Source/armclang/musca_bl2.sct
+++ b/platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_bl2.sct
diff --git a/platform/ext/target/musca_s1/Device/Source/armclang/musca_ns.sct b/platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_ns.sct
index ea7d5e1fd4..ea7d5e1fd4 100644
--- a/platform/ext/target/musca_s1/Device/Source/armclang/musca_ns.sct
+++ b/platform/ext/target/arm/musca_s1/Device/Source/armclang/musca_ns.sct
diff --git a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
index c395950b4a..c395950b4a 100644
--- a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
+++ b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
diff --git a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s
index 8b7a14805f..8b7a14805f 100644
--- a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s
+++ b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s
diff --git a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s
index 6293c8d395..6293c8d395 100644
--- a/platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s
+++ b/platform/ext/target/arm/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s
diff --git a/platform/ext/target/musca_s1/Device/Source/device_definition.c b/platform/ext/target/arm/musca_s1/Device/Source/device_definition.c
index 58b1689d96..58b1689d96 100644
--- a/platform/ext/target/musca_s1/Device/Source/device_definition.c
+++ b/platform/ext/target/arm/musca_s1/Device/Source/device_definition.c
diff --git a/platform/ext/target/musca_s1/Device/Source/gcc/musca_bl2.ld b/platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_bl2.ld
index bfae9003a6..bfae9003a6 100644
--- a/platform/ext/target/musca_s1/Device/Source/gcc/musca_bl2.ld
+++ b/platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_bl2.ld
diff --git a/platform/ext/target/musca_s1/Device/Source/gcc/musca_ns.ld b/platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_ns.ld
index fb26272afd..fb26272afd 100644
--- a/platform/ext/target/musca_s1/Device/Source/gcc/musca_ns.ld
+++ b/platform/ext/target/arm/musca_s1/Device/Source/gcc/musca_ns.ld
diff --git a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
index 21f729b001..21f729b001 100644
--- a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
+++ b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
diff --git a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S
index bc45037ea7..bc45037ea7 100644
--- a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S
+++ b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S
diff --git a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S
index bd4922d28f..bd4922d28f 100644
--- a/platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S
+++ b/platform/ext/target/arm/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S
diff --git a/platform/ext/target/musca_s1/Device/Source/system_core_init.c b/platform/ext/target/arm/musca_s1/Device/Source/system_core_init.c
index f08696f368..f08696f368 100644
--- a/platform/ext/target/musca_s1/Device/Source/system_core_init.c
+++ b/platform/ext/target/arm/musca_s1/Device/Source/system_core_init.c
diff --git a/platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.c b/platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.c
index f748ecf92f..f748ecf92f 100644
--- a/platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.c
+++ b/platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.c
diff --git a/platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.h b/platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.h
index c2dac2ca21..c2dac2ca21 100644
--- a/platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.h
+++ b/platform/ext/target/arm/musca_s1/Libraries/mt25ql_flash_lib.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/cache_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.c
index a44e6c1eff..a44e6c1eff 100644
--- a/platform/ext/target/musca_s1/Native_Driver/cache_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/cache_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.h
index 05fba4b1a4..05fba4b1a4 100644
--- a/platform/ext/target/musca_s1/Native_Driver/cache_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/cache_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.c
index 70260697c1..70260697c1 100644
--- a/platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.h
index 1df0f5fbfb..1df0f5fbfb 100644
--- a/platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/gpio_cmsdk_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.c
index 00dfa862c6..00dfa862c6 100644
--- a/platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.h
index 109bc59d34..109bc59d34 100644
--- a/platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/mpc_sie200_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.c
index 0230ec787e..0230ec787e 100644
--- a/platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.h
index c2b62ac002..c2b62ac002 100644
--- a/platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/mpu_armv8m_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.c
index 5b8db4f768..5b8db4f768 100644
--- a/platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.h
index bd522fd81b..bd522fd81b 100644
--- a/platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/musca_s1_scc_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.c
index 840bf9cfe6..840bf9cfe6 100644
--- a/platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.h
index b6ce8c2fe7..b6ce8c2fe7 100644
--- a/platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/ppc_sse200_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.c
index bb13a4219b..bb13a4219b 100644
--- a/platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.h
index 69929255dd..69929255dd 100644
--- a/platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/qspi_ip6514e_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.c
index 5c87a53aef..5c87a53aef 100644
--- a/platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.h
index 0259f11349..0259f11349 100644
--- a/platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/timer_cmsdk_drv.h
diff --git a/platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.c b/platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.c
index 0cb8ad4071..0cb8ad4071 100644
--- a/platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.c
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.c
diff --git a/platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.h b/platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.h
index 3947ddc502..3947ddc502 100644
--- a/platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.h
+++ b/platform/ext/target/arm/musca_s1/Native_Driver/uart_pl011_drv.h
diff --git a/platform/ext/target/musca_s1/boot_hal.c b/platform/ext/target/arm/musca_s1/boot_hal.c
index a8db47a65e..a8db47a65e 100644
--- a/platform/ext/target/musca_s1/boot_hal.c
+++ b/platform/ext/target/arm/musca_s1/boot_hal.c
diff --git a/platform/ext/target/musca_s1/config.cmake b/platform/ext/target/arm/musca_s1/config.cmake
index 27a90c5839..27a90c5839 100644
--- a/platform/ext/target/musca_s1/config.cmake
+++ b/platform/ext/target/arm/musca_s1/config.cmake
diff --git a/platform/ext/target/musca_s1/crypto_keys.c b/platform/ext/target/arm/musca_s1/crypto_keys.c
index d42916c614..d42916c614 100644
--- a/platform/ext/target/musca_s1/crypto_keys.c
+++ b/platform/ext/target/arm/musca_s1/crypto_keys.c
diff --git a/platform/ext/target/musca_s1/partition/flash_layout.h b/platform/ext/target/arm/musca_s1/partition/flash_layout.h
index bec8cc84e2..ae18715c77 100644
--- a/platform/ext/target/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/arm/musca_s1/partition/flash_layout.h
@@ -28,7 +28,7 @@
* 0x0A1E_4000 Internal Trusted Storage Area (16 KB)
* 0x0A1E_8000 NV counters area (4 KB)
* 0x0A1E_9000 TF-M key area (256 bytes) This area is referred to in
- * /lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/ \
+ * /lib/ext/cryptocell-312-runtime/shared/hw/include/arm/musca_s1/ \
* dx_reg_base_host.h Do not change one without changing the other.
* 0x0A1E_9100 Unused
* 0x0020_0000 Protected storage area (20 KB) This area is placed in the QSPI
@@ -46,7 +46,7 @@
* 0x0A1E_4000 Internal Trusted Storage Area (16 KB)
* 0x0A1E_8000 NV counters area (4 KB)
* 0x0A1E_9000 TF-M key area (256 bytes) This area is referred to in
- * /lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/ \
+ * /lib/ext/cryptocell-312-runtime/shared/hw/include/arm/musca_s1/ \
* dx_reg_base_host.h Do not change one without changing the other.
* 0x0A1E_9100 Unused
* 0x0020_0000 Protected storage area (20 KB) This area is placed in the QSPI
diff --git a/platform/ext/target/musca_s1/partition/region_defs.h b/platform/ext/target/arm/musca_s1/partition/region_defs.h
index ca8bb4b403..ca8bb4b403 100644
--- a/platform/ext/target/musca_s1/partition/region_defs.h
+++ b/platform/ext/target/arm/musca_s1/partition/region_defs.h
diff --git a/platform/ext/target/musca_s1/plat_test.c b/platform/ext/target/arm/musca_s1/plat_test.c
index cdfcfa209c..cdfcfa209c 100644
--- a/platform/ext/target/musca_s1/plat_test.c
+++ b/platform/ext/target/arm/musca_s1/plat_test.c
diff --git a/platform/ext/target/musca_s1/preload.cmake b/platform/ext/target/arm/musca_s1/preload.cmake
index 0eb0c464b4..0eb0c464b4 100644
--- a/platform/ext/target/musca_s1/preload.cmake
+++ b/platform/ext/target/arm/musca_s1/preload.cmake
diff --git a/platform/ext/target/musca_s1/services/include/tfm_ioctl_api.h b/platform/ext/target/arm/musca_s1/services/include/tfm_ioctl_api.h
index 345f210621..345f210621 100644
--- a/platform/ext/target/musca_s1/services/include/tfm_ioctl_api.h
+++ b/platform/ext/target/arm/musca_s1/services/include/tfm_ioctl_api.h
diff --git a/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_ns_api.c
index d834f87007..d834f87007 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c
+++ b/platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_ns_api.c
diff --git a/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c b/platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_s_api.c
index ff321ddbeb..ff321ddbeb 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c
+++ b/platform/ext/target/arm/musca_s1/services/src/tfm_ioctl_s_api.c
diff --git a/platform/ext/target/musca_s1/services/src/tfm_platform_system.c b/platform/ext/target/arm/musca_s1/services/src/tfm_platform_system.c
index 2160cc2aa6..2160cc2aa6 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_platform_system.c
+++ b/platform/ext/target/arm/musca_s1/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/musca_s1/spm_hal.c b/platform/ext/target/arm/musca_s1/spm_hal.c
index dba21775c6..dba21775c6 100644
--- a/platform/ext/target/musca_s1/spm_hal.c
+++ b/platform/ext/target/arm/musca_s1/spm_hal.c
diff --git a/platform/ext/target/musca_s1/target_cfg.c b/platform/ext/target/arm/musca_s1/target_cfg.c
index b107e2531c..b107e2531c 100644
--- a/platform/ext/target/musca_s1/target_cfg.c
+++ b/platform/ext/target/arm/musca_s1/target_cfg.c
diff --git a/platform/ext/target/musca_s1/target_cfg.h b/platform/ext/target/arm/musca_s1/target_cfg.h
index 6c95b19815..6c95b19815 100644
--- a/platform/ext/target/musca_s1/target_cfg.h
+++ b/platform/ext/target/arm/musca_s1/target_cfg.h
diff --git a/platform/ext/target/musca_s1/tfm_hal_isolation.c b/platform/ext/target/arm/musca_s1/tfm_hal_isolation.c
index 5dd8cfc764..5dd8cfc764 100644
--- a/platform/ext/target/musca_s1/tfm_hal_isolation.c
+++ b/platform/ext/target/arm/musca_s1/tfm_hal_isolation.c
diff --git a/platform/ext/target/musca_s1/tfm_peripherals_def.h b/platform/ext/target/arm/musca_s1/tfm_peripherals_def.h
index b4f8b0f8c6..b4f8b0f8c6 100644
--- a/platform/ext/target/musca_s1/tfm_peripherals_def.h
+++ b/platform/ext/target/arm/musca_s1/tfm_peripherals_def.h