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
diff --git a/platform/ext/index.rst b/platform/ext/index.rst
index 3c3e8d1..36e3af9 100644
--- a/platform/ext/index.rst
+++ b/platform/ext/index.rst
@@ -15,8 +15,7 @@
: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 6bf1064..fec9641 100644
--- a/platform/ext/platform_introduction.rst
+++ b/platform/ext/platform_introduction.rst
@@ -48,7 +48,7 @@
- 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
similarity index 100%
rename from platform/ext/target/mps2/an519/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/armclang/mps2_an519_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/armclang/mps2_an519_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/armclang/startup_cmsdk_mps2_an519_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/cmsis_cpu.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/mps2_an519.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_core/system_cmsdk_mps2_an519.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_drivers/Driver_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_drivers/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_drivers/Driver_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/cmsis_drivers/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/gcc/mps2_an519_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/gcc/mps2_an519_ns.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_ns.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/gcc/startup_cmsdk_mps2_an519_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/iar/mps2_an519_bl2.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/iar/mps2_an519_ns.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/iar/startup_cmsdk_mps2_an519_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/arm_uart_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/mpc_sie200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/ppc_sse200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/native_drivers/timer_cmsdk/timer_cmsdk.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/retarget/platform_retarget.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/retarget/platform_retarget_dev.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/retarget/platform_retarget_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an519/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/armclang/mps2_an521_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/armclang/mps2_an521_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/armclang/startup_cmsdk_mps2_an521_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/cmsis_cpu.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/mps2_an521.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_core/system_cmsdk_mps2_an521.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_drivers/Driver_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_drivers/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_drivers/Driver_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/cmsis_drivers/Driver_USART.c
rename to 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
similarity index 80%
rename from platform/ext/target/mps2/an521/config.cmake
rename to platform/ext/target/arm/mps2/an521/config.cmake
index 1d3b682..b0dbc04 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
similarity index 100%
rename from platform/ext/target/mps2/an521/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/gcc/mps2_an521_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/gcc/mps2_an521_ns.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_ns.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/gcc/startup_cmsdk_mps2_an521_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/generated_file_list.yaml
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/iar/mps2_an521_bl2.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/iar/mps2_an521_ns.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/iar/startup_cmsdk_mps2_an521_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/mbedtls_an521_conf.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/arm_uart_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/mpc_sie200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/ppc_sse200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/native_drivers/timer_cmsdk/timer_cmsdk.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/retarget/platform_retarget.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/retarget/platform_retarget_dev.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/retarget/platform_retarget_dev.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/retarget/platform_retarget_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/an521/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/common/smm_mps2.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_SSE300_PPC.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/cmsis_drivers/config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/armclang/fvp_sse300_mps2_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_bl2.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/iar/fvp_sse300_mps2_ns.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_bl2.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_ns.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/startup_fvp_sse300_mps2_s.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/device/source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/mpc_sie_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/ppc_sse300_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/systimer_armv8-m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/native_drivers/uart_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/partition/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps2/fvp_sse300/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/Driver_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/cmsis_drivers/config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/platform_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/armclang/mps3_an524_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/armclang/startup_cmsdk_mps3_an524_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/gcc/mps3_an524_ns.ld
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_ns.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/gcc/startup_cmsdk_mps3_an524_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/iar/mps3_an524_bl2.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/iar/mps3_an524_ns.icf
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/iar/startup_cmsdk_mps3_an524_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/device/source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/mpc_sie200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/ppc_sse200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/timer_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/native_drivers/uart_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an524/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/README.rst
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/Driver_AN547_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/Driver_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/Driver_SSE300_PPC.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/cmsis_drivers/config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/platform_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/armclang/an547_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/armclang/an547_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/startup_an547_bl2.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/startup_an547_ns.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/startup_an547_s.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/device/source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/mpc_sie_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/ppc_sse300_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/syscounter_armv8-m_cntrl_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/systimer_armv8-m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/native_drivers/uart_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/partition/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/mps3/an547/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Libraries/mt25ql_flash_lib.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/gfc100_eflash_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/gfc100_process_spec_api.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/mhu_v2_x.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/generated_file_list.yaml
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/musca_b1_secure_enclave_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/armclang/startup_musca_b1_secure_enclave_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/musca_b1_secure_enclave_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/gcc/startup_musca_b1_secure_enclave_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/Device/Source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/mailbox/mailbox_ipc_intr.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_multicore.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/mailbox/platform_spe_mailbox.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/preload_ns.cmake
rename to 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
similarity index 96%
rename from platform/ext/target/musca_b1/secure_enclave/readme.rst
rename to platform/ext/target/arm/musca_b1/secure_enclave/readme.rst
index a9af495..c878a0d 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 @@
- 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/secure_enclave/uart_stdout.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/attest_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/boot_hal.c
rename to 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
similarity index 94%
rename from platform/ext/target/musca_b1/sse_200/config.cmake
rename to platform/ext/target/arm/musca_b1/sse_200/config.cmake
index 13fb636..61f6c15 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 @@
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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/crypto_keys.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/partition/flash_layout.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/readme.rst
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Config/RTE_Device.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Config/cmsis_driver_config.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Driver_MPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Driver_PPC.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Driver_QSPI_Flash.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMSIS_Driver/Driver_USART.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/CMakeLists.txt
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Config/device_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/cmsis.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/device_definition.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/platform_base_address.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/platform_description.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/platform_irq.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/platform_pins.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/platform_regs.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Include/system_core_init.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/armclang/musca_bl2.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/armclang/musca_ns.sct
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_ns.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/armclang/startup_cmsdk_musca_s.s
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/device_definition.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/gcc/musca_bl2.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/gcc/musca_ns.ld
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_ns.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/gcc/startup_cmsdk_musca_s.S
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Device/Source/system_core_init.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Libraries/mt25ql_flash_lib.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/cache_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/cache_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/gpio_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/mpc_sie200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/mpu_armv8m_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/musca_s1_scc_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/ppc_sse200_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/qspi_ip6514e_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/timer_cmsdk_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/Native_Driver/uart_pl011_drv.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/boot_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/config.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/crypto_keys.c
rename to 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
similarity index 99%
rename from platform/ext/target/musca_s1/partition/flash_layout.h
rename to platform/ext/target/arm/musca_s1/partition/flash_layout.h
index bec8cc8..ae18715 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
similarity index 100%
rename from platform/ext/target/musca_s1/partition/region_defs.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/plat_test.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/preload.cmake
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/services/include/tfm_ioctl_api.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/services/src/tfm_platform_system.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/spm_hal.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/target_cfg.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/target_cfg.h
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/tfm_hal_isolation.c
rename to 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
similarity index 100%
rename from platform/ext/target/musca_s1/tfm_peripherals_def.h
rename to platform/ext/target/arm/musca_s1/tfm_peripherals_def.h