Build: Restructure Musca-B1 folders
Original musca_b1 platform is renamed to musca_b1/sse_200, and
musca_b1_secure_enclave is renamed to musca_b1/secure_enclave.
Change-Id: If05f1878cff3808ec95e207abe4a0a433998523c
Signed-off-by: Gabor Abonyi <gabor.abonyi@arm.com>
Signed-off-by: Mark Horvath <mark.horvath@arm.com>
diff --git a/config/check_config.cmake b/config/check_config.cmake
index d72154b..10ba5c9 100644
--- a/config/check_config.cmake
+++ b/config/check_config.cmake
@@ -21,7 +21,7 @@
tfm_invalid_config(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "7.3.1")
-set (TFM_L3_PLATFORM_LISTS mps2/an521 musca_b1)
+set (TFM_L3_PLATFORM_LISTS mps2/an521 musca_b1/sse_200)
tfm_invalid_config(TFM_ISOLATION_LEVEL LESS 1 OR TFM_ISOLATION_LEVEL GREATER 3)
tfm_invalid_config(TFM_ISOLATION_LEVEL EQUAL 3 AND NOT TFM_PLATFORM IN_LIST TFM_L3_PLATFORM_LISTS)
diff --git a/docs/getting_started/tfm_secure_boot.rst b/docs/getting_started/tfm_secure_boot.rst
index 3cc2b61..03175f2 100644
--- a/docs/getting_started/tfm_secure_boot.rst
+++ b/docs/getting_started/tfm_secure_boot.rst
@@ -311,7 +311,7 @@
Example of how to provide the secure image minimum version::
- cmake -DTFM_PLATFORM=musca_b1 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DMCUBOOT_S_IMAGE_MIN_VER=1.2.3+4 ..
+ cmake -DTFM_PLATFORM=musca_b1/sse_200 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DMCUBOOT_S_IMAGE_MIN_VER=1.2.3+4 ..
********************
Signature algorithms
@@ -429,7 +429,7 @@
The version number of the image (single image boot) can manually be passed in
through the command line in the cmake configuration step::
- cmake -DTFM_PLATFORM=musca_b1 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DIMAGE_VERSION_S=1.2.3+4 ..
+ cmake -DTFM_PLATFORM=musca_b1/sse_200 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DIMAGE_VERSION_S=1.2.3+4 ..
Alternatively, the version number can be less specific (e.g 1, 1.2, or 1.2.3),
where the missing numbers are automatically set to zero. The image version
@@ -463,7 +463,7 @@
current image version. The value of the security counter (single image boot) can
be specified at build time in the cmake configuration step::
- cmake -DTFM_PLATFORM=musca_b1 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DSECURITY_COUNTER_S=42 ../
+ cmake -DTFM_PLATFORM=musca_b1/sse_200 -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake -DSECURITY_COUNTER_S=42 ../
The security counter can be independent from the image version, but not
necessarily. Alternatively, if it is not specified at build time with the
diff --git a/docs/getting_started/tfm_user_guide.rst b/docs/getting_started/tfm_user_guide.rst
index 58746ef..1a2de50 100644
--- a/docs/getting_started/tfm_user_guide.rst
+++ b/docs/getting_started/tfm_user_guide.rst
@@ -224,7 +224,7 @@
.. Note::
Before executing any images on Musca-B1 board, please check the
- :doc:`target platform readme </platform/ext/target/musca_b1/readme>`
+ :doc:`target platform readme </platform/ext/target/musca_b1/sse_200/readme>`
to have the correct setup.
Example application with BL2 bootloader
@@ -431,7 +431,7 @@
============================================================================
Follow the above procedures, but to create a unified hex please check the
-:doc:`Musca-B1 Secure Enclave readme </platform/ext/target/musca_b1_secure_enclave/readme>`.
+:doc:`Musca-B1 Secure Enclave readme </platform/ext/target/musca_b1/secure_enclave/readme>`.
********************************************************
Execute TF-M example and regression tests on MPS3 boards
diff --git a/docs/introduction/readme.rst b/docs/introduction/readme.rst
index e867ba3..2e07c11 100644
--- a/docs/introduction/readme.rst
+++ b/docs/introduction/readme.rst
@@ -162,7 +162,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/musca_b1/secure_enclave/readme>`
The document :doc:`Platform Deprecation and Removal </docs/contributing/platform_deprecation>`
lists the deprecated platforms planned to be removed from upstream.
diff --git a/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1_secure_enclave/dx_reg_base_host.h b/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/secure_enclave/dx_reg_base_host.h
similarity index 100%
rename from lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1_secure_enclave/dx_reg_base_host.h
rename to lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/secure_enclave/dx_reg_base_host.h
diff --git a/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/dx_reg_base_host.h b/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/sse_200/dx_reg_base_host.h
similarity index 100%
rename from lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/dx_reg_base_host.h
rename to lib/ext/cryptocell-312-runtime/shared/hw/include/musca_b1/sse_200/dx_reg_base_host.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/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/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/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/musca_b1/secure_enclave/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/CMSIS_Driver/Driver_GFC100_EFlash.c b/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Driver_GFC100_EFlash.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/CMSIS_Driver/Driver_GFC100_EFlash.c
rename to platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Driver_GFC100_EFlash.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/CMSIS_Driver/Driver_QSPI_Flash.c b/platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Driver_QSPI_Flash.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/CMSIS_Driver/Driver_QSPI_Flash.c
rename to platform/ext/target/musca_b1/secure_enclave/CMSIS_Driver/Driver_QSPI_Flash.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/CMakeLists.txt b/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
similarity index 97%
rename from platform/ext/target/musca_b1_secure_enclave/CMakeLists.txt
rename to platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
index f8253d3..8a862be 100644
--- a/platform/ext/target/musca_b1_secure_enclave/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/secure_enclave/CMakeLists.txt
@@ -121,6 +121,6 @@
Native_Driver
Libraries
${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
- ${CMAKE_CURRENT_BINARY_DIR}/../../../../bl2/ext/mcuboot # for mcuboot_con
+ ${CMAKE_CURRENT_BINARY_DIR}/../../../../../bl2/ext/mcuboot # for mcuboot_con
)
endif()
diff --git a/platform/ext/target/musca_b1_secure_enclave/Device/Config/device_cfg.h b/platform/ext/target/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/musca_b1/secure_enclave/Device/Source/system_core_init.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Libraries/mt25ql_flash_lib.c b/platform/ext/target/musca_b1/secure_enclave/Libraries/mt25ql_flash_lib.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Libraries/mt25ql_flash_lib.c
rename to platform/ext/target/musca_b1/secure_enclave/Libraries/mt25ql_flash_lib.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Libraries/mt25ql_flash_lib.h b/platform/ext/target/musca_b1/secure_enclave/Libraries/mt25ql_flash_lib.h
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Libraries/mt25ql_flash_lib.h
rename to platform/ext/target/musca_b1/secure_enclave/Libraries/mt25ql_flash_lib.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_eflash_drv.c b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_eflash_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_eflash_drv.c
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_eflash_drv.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_eflash_drv.h b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_eflash_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_eflash_drv.h
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_eflash_drv.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_process_spec_api.h b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_process_spec_api.h
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/gfc100_process_spec_api.h
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/gfc100_process_spec_api.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/mhu_v2_x.c b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/mhu_v2_x.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/mhu_v2_x.c
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/mhu_v2_x.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/mhu_v2_x.h b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/mhu_v2_x.h
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/mhu_v2_x.h
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/mhu_v2_x.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/musca_b1_eflash_drv.c b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/musca_b1_eflash_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/musca_b1_eflash_drv.c
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/musca_b1_eflash_drv.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/qspi_ip6514e_drv.c b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/qspi_ip6514e_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/qspi_ip6514e_drv.c
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/qspi_ip6514e_drv.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/Native_Driver/qspi_ip6514e_drv.h b/platform/ext/target/musca_b1/secure_enclave/Native_Driver/qspi_ip6514e_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1_secure_enclave/Native_Driver/qspi_ip6514e_drv.h
rename to platform/ext/target/musca_b1/secure_enclave/Native_Driver/qspi_ip6514e_drv.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/boot_hal.c b/platform/ext/target/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/musca_b1/secure_enclave/boot_hal.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/config.cmake b/platform/ext/target/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/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/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/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/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/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/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/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/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/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/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/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/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/musca_b1/secure_enclave/partition/region_defs.h
diff --git a/platform/ext/target/musca_b1_secure_enclave/preload.cmake b/platform/ext/target/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/musca_b1/secure_enclave/preload.cmake
diff --git a/platform/ext/target/musca_b1_secure_enclave/preload_ns.cmake b/platform/ext/target/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/musca_b1/secure_enclave/preload_ns.cmake
diff --git a/platform/ext/target/musca_b1_secure_enclave/readme.rst b/platform/ext/target/musca_b1/secure_enclave/readme.rst
similarity index 74%
rename from platform/ext/target/musca_b1_secure_enclave/readme.rst
rename to platform/ext/target/musca_b1/secure_enclave/readme.rst
index fa58bf8..8b301aa 100644
--- a/platform/ext/target/musca_b1_secure_enclave/readme.rst
+++ b/platform/ext/target/musca_b1/secure_enclave/readme.rst
@@ -65,23 +65,32 @@
- 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`` and the ``FORWARD_PROT_MSG`` cmake flag also needs
- to be set.
+ to be set to ``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 ``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.
+both builds, but MCUBoot image is only built for the SE platform. The cmake
+setup for the two builds must have the same debug profile (eg. debug, release).
To create a unified hex file:
- Windows::
- srec_cat.exe TBD
+ srec_cat.exe <SE build dir>\bin\bl2.bin -Binary -offset 0x1A020000 ^
+ <SE build dir>\bin\tfm_s_signed.bin -Binary -offset 0x1A200000 ^
+ <SSE-200 build dir>\bin\bl0.bin -Binary -offset 0x1A000000 ^
+ <SSE-200 build dir>\bin\tfm_s_ns_signed.bin -Binary -offset 0x1A260000 ^
+ -o tfm_sse200_w_se.hex -Intel
- Linux::
- srec_cat TBD
+ srec_cat <SE build dir>/bin/bl2.bin -Binary -offset 0x1A020000 \
+ <SE build dir>/bin/tfm_s_signed.bin -Binary -offset 0x1A200000 \
+ <SSE-200 build dir>/bin/bl0.bin -Binary -offset 0x1A000000 \
+ <SSE-200 build dir>/bin/tfm_s_ns_signed.bin -Binary -offset 0x1A260000 \
+ -o tfm_sse200_w_se.hex -Intel
*****************
Known limitations
diff --git a/platform/ext/target/musca_b1_secure_enclave/services/src/tfm_platform_system.c b/platform/ext/target/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/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/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/musca_b1/secure_enclave/spm_hal.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/target_cfg.c b/platform/ext/target/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/musca_b1/secure_enclave/target_cfg.c
diff --git a/platform/ext/target/musca_b1_secure_enclave/target_cfg.h b/platform/ext/target/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/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/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/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/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/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/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/musca_b1/secure_enclave/uart_stdout.c
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Config/RTE_Device.h
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Config/cmsis_driver_config.h b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Config/cmsis_driver_config.h
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Driver_GFC100_EFlash.c b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_GFC100_EFlash.c
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Driver_GFC100_EFlash.c
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_GFC100_EFlash.c
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Driver_MPC.c b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Driver_MPC.c
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Driver_PPC.c b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Driver_PPC.c
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Driver_QSPI_Flash.c b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_QSPI_Flash.c
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Driver_QSPI_Flash.c
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_QSPI_Flash.c
diff --git a/platform/ext/target/musca_b1/CMSIS_Driver/Driver_USART.c b/platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
similarity index 100%
rename from platform/ext/target/musca_b1/CMSIS_Driver/Driver_USART.c
rename to platform/ext/target/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
diff --git a/platform/ext/target/musca_b1/CMakeLists.txt b/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
similarity index 98%
rename from platform/ext/target/musca_b1/CMakeLists.txt
rename to platform/ext/target/musca_b1/sse_200/CMakeLists.txt
index 68eea16..49f6e13 100644
--- a/platform/ext/target/musca_b1/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/sse_200/CMakeLists.txt
@@ -185,6 +185,6 @@
Native_Driver
Libraries
${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
- ${CMAKE_CURRENT_BINARY_DIR}/../../../../bl2/ext/mcuboot # for mcuboot_config.h only
+ ${CMAKE_CURRENT_BINARY_DIR}/../../../../../bl2/ext/mcuboot # for mcuboot_config.h only
)
endif()
diff --git a/platform/ext/target/musca_b1/Device/Config/device_cfg.h b/platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Config/device_cfg.h
rename to platform/ext/target/musca_b1/sse_200/Device/Config/device_cfg.h
diff --git a/platform/ext/target/musca_b1/Device/Include/cmsis.h b/platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/cmsis.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/cmsis.h
diff --git a/platform/ext/target/musca_b1/Device/Include/device_definition.h b/platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/device_definition.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/device_definition.h
diff --git a/platform/ext/target/musca_b1/Device/Include/platform_base_address.h b/platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/platform_base_address.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/platform_base_address.h
diff --git a/platform/ext/target/musca_b1/Device/Include/platform_description.h b/platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/platform_description.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/platform_description.h
diff --git a/platform/ext/target/musca_b1/Device/Include/platform_irq.h b/platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/platform_irq.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/platform_irq.h
diff --git a/platform/ext/target/musca_b1/Device/Include/platform_pins.h b/platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/platform_pins.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/platform_pins.h
diff --git a/platform/ext/target/musca_b1/Device/Include/platform_regs.h b/platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/platform_regs.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/platform_regs.h
diff --git a/platform/ext/target/musca_b1/Device/Include/system_core_init.h b/platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Include/system_core_init.h
rename to platform/ext/target/musca_b1/sse_200/Device/Include/system_core_init.h
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/musca_bl0.sct b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/musca_bl0.sct
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl0.sct
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/musca_bl2.sct b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/musca_bl2.sct
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/musca_ns.sct b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/musca_ns.sct
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_bl2.s b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_ns.s b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_ns.s
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
diff --git a/platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_s.s b/platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/armclang/startup_cmsdk_musca_s.s
rename to platform/ext/target/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
diff --git a/platform/ext/target/musca_b1/Device/Source/device_definition.c b/platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/device_definition.c
rename to platform/ext/target/musca_b1/sse_200/Device/Source/device_definition.c
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/musca_bl0.ld b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/musca_bl0.ld
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl0.ld
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/musca_bl2.ld b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/musca_bl2.ld
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/musca_ns.ld b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/musca_ns.ld
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_bl2.S b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_ns.S b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_ns.S
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_s.S b/platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/gcc/startup_cmsdk_musca_s.S
rename to platform/ext/target/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
diff --git a/platform/ext/target/musca_b1/Device/Source/system_core_init.c b/platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c
similarity index 100%
rename from platform/ext/target/musca_b1/Device/Source/system_core_init.c
rename to platform/ext/target/musca_b1/sse_200/Device/Source/system_core_init.c
diff --git a/platform/ext/target/musca_b1/Libraries/mt25ql_flash_lib.c b/platform/ext/target/musca_b1/sse_200/Libraries/mt25ql_flash_lib.c
similarity index 100%
rename from platform/ext/target/musca_b1/Libraries/mt25ql_flash_lib.c
rename to platform/ext/target/musca_b1/sse_200/Libraries/mt25ql_flash_lib.c
diff --git a/platform/ext/target/musca_b1/Libraries/mt25ql_flash_lib.h b/platform/ext/target/musca_b1/sse_200/Libraries/mt25ql_flash_lib.h
similarity index 100%
rename from platform/ext/target/musca_b1/Libraries/mt25ql_flash_lib.h
rename to platform/ext/target/musca_b1/sse_200/Libraries/mt25ql_flash_lib.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_eflash_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_eflash_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_eflash_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/gfc100_eflash_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_eflash_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/gfc100_process_spec_api.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_process_spec_api.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/gfc100_process_spec_api.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/gfc100_process_spec_api.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/gpio_cmsdk_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/gpio_cmsdk_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/gpio_cmsdk_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/gpio_cmsdk_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/mhu_v2_x.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/mhu_v2_x.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mhu_v2_x.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mhu_v2_x.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/mhu_v2_x.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/mhu_v2_x.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mhu_v2_x.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mhu_v2_x.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/mpc_sie200_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mpc_sie200_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/mpc_sie200_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mpc_sie200_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/mpu_armv8m_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mpu_armv8m_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/mpu_armv8m_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/mpu_armv8m_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/musca_b1_eflash_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_eflash_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/musca_b1_eflash_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_eflash_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/musca_b1_scc_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/musca_b1_scc_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/musca_b1_scc_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/musca_b1_scc_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/ppc_sse200_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/ppc_sse200_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/ppc_sse200_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/ppc_sse200_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/qspi_ip6514e_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/qspi_ip6514e_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/qspi_ip6514e_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/qspi_ip6514e_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/qspi_ip6514e_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/qspi_ip6514e_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/qspi_ip6514e_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/qspi_ip6514e_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/timer_cmsdk_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/timer_cmsdk_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/timer_cmsdk_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/timer_cmsdk_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
diff --git a/platform/ext/target/musca_b1/Native_Driver/uart_pl011_drv.c b/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/uart_pl011_drv.c
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
diff --git a/platform/ext/target/musca_b1/Native_Driver/uart_pl011_drv.h b/platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
similarity index 100%
rename from platform/ext/target/musca_b1/Native_Driver/uart_pl011_drv.h
rename to platform/ext/target/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
diff --git a/platform/ext/target/musca_b1/attest_hal.c b/platform/ext/target/musca_b1/sse_200/attest_hal.c
similarity index 100%
rename from platform/ext/target/musca_b1/attest_hal.c
rename to platform/ext/target/musca_b1/sse_200/attest_hal.c
diff --git a/platform/ext/target/musca_b1/bl0/CMakeLists.txt b/platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt
similarity index 93%
rename from platform/ext/target/musca_b1/bl0/CMakeLists.txt
rename to platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt
index 115e7d0..f8abcbf 100644
--- a/platform/ext/target/musca_b1/bl0/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/sse_200/bl0/CMakeLists.txt
@@ -37,8 +37,8 @@
target_include_directories(bl0
PUBLIC
- ${CMAKE_MUSCA_B1_SSE_200_SOURCE_DIR}/../../cmsis
- ${CMAKE_MUSCA_B1_SSE_200_SOURCE_DIR}/../../../include
+ ${CMAKE_MUSCA_B1_SSE_200_SOURCE_DIR}/../../../cmsis
+ ${CMAKE_MUSCA_B1_SSE_200_SOURCE_DIR}/../../../../include
)
target_compile_definitions(bl0
diff --git a/platform/ext/target/musca_b1/bl0/bl0_main.c b/platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c
similarity index 100%
rename from platform/ext/target/musca_b1/bl0/bl0_main.c
rename to platform/ext/target/musca_b1/sse_200/bl0/bl0_main.c
diff --git a/platform/ext/target/musca_b1/bl0/device_cfg.h b/platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h
similarity index 100%
rename from platform/ext/target/musca_b1/bl0/device_cfg.h
rename to platform/ext/target/musca_b1/sse_200/bl0/device_cfg.h
diff --git a/platform/ext/target/musca_b1/boot_hal.c b/platform/ext/target/musca_b1/sse_200/boot_hal.c
similarity index 100%
rename from platform/ext/target/musca_b1/boot_hal.c
rename to platform/ext/target/musca_b1/sse_200/boot_hal.c
diff --git a/platform/ext/target/musca_b1/config.cmake b/platform/ext/target/musca_b1/sse_200/config.cmake
similarity index 100%
rename from platform/ext/target/musca_b1/config.cmake
rename to platform/ext/target/musca_b1/sse_200/config.cmake
diff --git a/platform/ext/target/musca_b1/crypto_keys.c b/platform/ext/target/musca_b1/sse_200/crypto_keys.c
similarity index 100%
rename from platform/ext/target/musca_b1/crypto_keys.c
rename to platform/ext/target/musca_b1/sse_200/crypto_keys.c
diff --git a/platform/ext/target/musca_b1/mailbox/platform_multicore.c b/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c
similarity index 100%
rename from platform/ext/target/musca_b1/mailbox/platform_multicore.c
rename to platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.c
diff --git a/platform/ext/target/musca_b1/mailbox/platform_multicore.h b/platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h
similarity index 100%
rename from platform/ext/target/musca_b1/mailbox/platform_multicore.h
rename to platform/ext/target/musca_b1/sse_200/mailbox/platform_multicore.h
diff --git a/platform/ext/target/musca_b1/mailbox/platform_ns_mailbox.c b/platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
similarity index 100%
rename from platform/ext/target/musca_b1/mailbox/platform_ns_mailbox.c
rename to platform/ext/target/musca_b1/sse_200/mailbox/platform_ns_mailbox.c
diff --git a/platform/ext/target/musca_b1/partition/flash_layout.h b/platform/ext/target/musca_b1/sse_200/partition/flash_layout.h
similarity index 100%
rename from platform/ext/target/musca_b1/partition/flash_layout.h
rename to platform/ext/target/musca_b1/sse_200/partition/flash_layout.h
diff --git a/platform/ext/target/musca_b1/partition/region_defs.h b/platform/ext/target/musca_b1/sse_200/partition/region_defs.h
similarity index 100%
rename from platform/ext/target/musca_b1/partition/region_defs.h
rename to platform/ext/target/musca_b1/sse_200/partition/region_defs.h
diff --git a/platform/ext/target/musca_b1/partition/region_defs_bl0.h b/platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h
similarity index 100%
rename from platform/ext/target/musca_b1/partition/region_defs_bl0.h
rename to platform/ext/target/musca_b1/sse_200/partition/region_defs_bl0.h
diff --git a/platform/ext/target/musca_b1/plat_test.c b/platform/ext/target/musca_b1/sse_200/plat_test.c
similarity index 100%
rename from platform/ext/target/musca_b1/plat_test.c
rename to platform/ext/target/musca_b1/sse_200/plat_test.c
diff --git a/platform/ext/target/musca_b1/preload.cmake b/platform/ext/target/musca_b1/sse_200/preload.cmake
similarity index 100%
rename from platform/ext/target/musca_b1/preload.cmake
rename to platform/ext/target/musca_b1/sse_200/preload.cmake
diff --git a/platform/ext/target/musca_b1/readme.rst b/platform/ext/target/musca_b1/sse_200/readme.rst
similarity index 100%
rename from platform/ext/target/musca_b1/readme.rst
rename to platform/ext/target/musca_b1/sse_200/readme.rst
diff --git a/platform/ext/target/musca_b1/services/include/tfm_ioctl_api.h b/platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h
similarity index 100%
rename from platform/ext/target/musca_b1/services/include/tfm_ioctl_api.h
rename to platform/ext/target/musca_b1/sse_200/services/include/tfm_ioctl_api.h
diff --git a/platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
similarity index 100%
rename from platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c
rename to platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
diff --git a/platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c b/platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
similarity index 100%
rename from platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c
rename to platform/ext/target/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
diff --git a/platform/ext/target/musca_b1/services/src/tfm_platform_system.c b/platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c
similarity index 100%
rename from platform/ext/target/musca_b1/services/src/tfm_platform_system.c
rename to platform/ext/target/musca_b1/sse_200/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/musca_b1/spm_hal.c b/platform/ext/target/musca_b1/sse_200/spm_hal.c
similarity index 100%
rename from platform/ext/target/musca_b1/spm_hal.c
rename to platform/ext/target/musca_b1/sse_200/spm_hal.c
diff --git a/platform/ext/target/musca_b1/target_cfg.c b/platform/ext/target/musca_b1/sse_200/target_cfg.c
similarity index 100%
rename from platform/ext/target/musca_b1/target_cfg.c
rename to platform/ext/target/musca_b1/sse_200/target_cfg.c
diff --git a/platform/ext/target/musca_b1/target_cfg.h b/platform/ext/target/musca_b1/sse_200/target_cfg.h
similarity index 100%
rename from platform/ext/target/musca_b1/target_cfg.h
rename to platform/ext/target/musca_b1/sse_200/target_cfg.h
diff --git a/platform/ext/target/musca_b1/tfm_hal_isolation.c b/platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c
similarity index 100%
rename from platform/ext/target/musca_b1/tfm_hal_isolation.c
rename to platform/ext/target/musca_b1/sse_200/tfm_hal_isolation.c
diff --git a/platform/ext/target/musca_b1/tfm_peripherals_def.h b/platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h
similarity index 100%
rename from platform/ext/target/musca_b1/tfm_peripherals_def.h
rename to platform/ext/target/musca_b1/sse_200/tfm_peripherals_def.h