Platform: Move Musca-B1 port up by 1 directory
As the Musca-B1 Secure Enclave port was removed there is no need for an
additional subdirectory for the main Musca-B1 port.
Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Change-Id: Ie55deae37cb95de1ddc8569fe57f7ad9f97371bf
diff --git a/config/check_config.cmake b/config/check_config.cmake
index 5156977..329e22f 100644
--- a/config/check_config.cmake
+++ b/config/check_config.cmake
@@ -70,7 +70,7 @@
####################### Code sharing ###########################################
-set(TFM_CODE_SHARING_PLATFORM_LISTS arm/mps2/an521 arm/musca_b1/sse_200) # Without crypto hw acceleration
+set(TFM_CODE_SHARING_PLATFORM_LISTS arm/mps2/an521 arm/musca_b1) # Without crypto hw acceleration
tfm_invalid_config(NOT TFM_CODE_SHARING STREQUAL "OFF" AND NOT TFM_PLATFORM IN_LIST TFM_CODE_SHARING_PLATFORM_LISTS)
tfm_invalid_config(NOT TFM_CODE_SHARING STREQUAL "OFF" AND CRYPTO_HW_ACCELERATOR)
diff --git a/docs/building/run_tfm_examples_on_arm_platforms.rst b/docs/building/run_tfm_examples_on_arm_platforms.rst
index 23ab2fd..6c66b31 100644
--- a/docs/building/run_tfm_examples_on_arm_platforms.rst
+++ b/docs/building/run_tfm_examples_on_arm_platforms.rst
@@ -221,7 +221,7 @@
.. Note::
Before executing any images on Musca-B1 board, please check the
- :doc:`target platform readme </platform/arm/musca_b1/sse_200/readme>`
+ :doc:`target platform readme </platform/arm/musca_b1/readme>`
to have the correct setup.
Install SRecord for Musca test chip boards.
diff --git a/docs/platform/arm/index.rst b/docs/platform/arm/index.rst
index 732228a..436518c 100755
--- a/docs/platform/arm/index.rst
+++ b/docs/platform/arm/index.rst
@@ -9,7 +9,7 @@
Corstone-300 FPGA (AN547) <mps3/an547/README.rst>
Corstone-300 FPGA and FVP (AN552) <mps3/an552/README.rst>
Corstone-310 FVP <mps3/corstone310_fvp/README.rst>
- Musca-B1 <musca_b1/sse_200/readme.rst>
+ Musca-B1 <musca_b1/readme.rst>
Musca-S1 <musca_s1/readme.rst>
Runtime Security Subsystem <rss/readme.rst>
diff --git a/docs/platform/arm/musca_b1/sse_200/readme.rst b/docs/platform/arm/musca_b1/readme.rst
similarity index 100%
rename from docs/platform/arm/musca_b1/sse_200/readme.rst
rename to docs/platform/arm/musca_b1/readme.rst
diff --git a/docs/technical_references/design_docs/tfm_secure_boot.rst b/docs/technical_references/design_docs/tfm_secure_boot.rst
index 0535b23..043af16 100644
--- a/docs/technical_references/design_docs/tfm_secure_boot.rst
+++ b/docs/technical_references/design_docs/tfm_secure_boot.rst
@@ -311,7 +311,7 @@
Example of how to provide the secure image minimum version::
- cmake -DTFM_PLATFORM=arm/musca_b1/sse_200 -DMCUBOOT_S_IMAGE_MIN_VER=1.2.3+4 ..
+ cmake -DTFM_PLATFORM=arm/musca_b1 -DMCUBOOT_S_IMAGE_MIN_VER=1.2.3+4 ..
********************
Signature algorithms
@@ -432,7 +432,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=arm/musca_b1/sse_200 -DIMAGE_VERSION_S=1.2.3+4 ..
+ cmake -DTFM_PLATFORM=arm/musca_b1 -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
@@ -466,7 +466,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=arm/musca_b1/sse_200 -DSECURITY_COUNTER_S=42 ../
+ cmake -DTFM_PLATFORM=arm/musca_b1 -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/platform/ext/accelerator/cc312/CMakeLists.txt b/platform/ext/accelerator/cc312/CMakeLists.txt
index cf0aa34..2fc5d81 100644
--- a/platform/ext/accelerator/cc312/CMakeLists.txt
+++ b/platform/ext/accelerator/cc312/CMakeLists.txt
@@ -204,7 +204,7 @@
# the legacy driver as the new PSA driver overflows the available flash
# memory of the SSE-200 subsystem
if ((NOT ${CC312_LEGACY_DRIVER_API_ENABLED}) AND
- TEST_S AND (${CMAKE_BUILD_TYPE} STREQUAL "Debug") AND (${TFM_PLATFORM} STREQUAL "arm/musca_b1/sse_200"))
+ TEST_S AND (${CMAKE_BUILD_TYPE} STREQUAL "Debug") AND (${TFM_PLATFORM} STREQUAL "arm/musca_b1"))
set(CC312_LEGACY_DRIVER_API_ENABLED ON)
message(WARNING
"The CC-312 legacy driver interface fallback is forced to ${CC312_LEGACY_DRIVER_API_ENABLED}. \
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Config/RTE_Device.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/RTE_Device.h
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Config/RTE_Device.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Config/cmsis_driver_config.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Config/cmsis_driver_config.h
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Config/cmsis_driver_config.h
diff --git a/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_GFC100_EFlash.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_GFC100_EFlash.c
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_GFC100_EFlash.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_MPC.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_MPC.c
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_MPC.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_PPC.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_PPC.c
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_PPC.c
diff --git a/platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_QSPI_Flash.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/CMSIS_Driver/Driver_QSPI_Flash.c
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_QSPI_Flash.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c b/platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_USART.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/CMSIS_Driver/Driver_USART.c
rename to platform/ext/target/arm/musca_b1/CMSIS_Driver/Driver_USART.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt b/platform/ext/target/arm/musca_b1/CMakeLists.txt
similarity index 85%
rename from platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
rename to platform/ext/target/arm/musca_b1/CMakeLists.txt
index 4faa450..9f8310c 100644
--- a/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_b1/CMakeLists.txt
@@ -7,8 +7,6 @@
cmake_policy(SET CMP0076 NEW)
set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(CMAKE_MUSCA_B1_SSE_200_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(CMAKE_MUSCA_B1_COMMON_DIR ${CMAKE_CURRENT_LIST_DIR}/../common)
#========================= Platform region defs ===============================#
@@ -82,16 +80,16 @@
Native_Driver
partition
services/include
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver
+ Libraries
+ Native_Driver
INTERFACE
- ${CMAKE_MUSCA_B1_COMMON_DIR}/cc312
+ cc312
)
target_sources(platform_s
PRIVATE
- ${CMAKE_MUSCA_B1_COMMON_DIR}/CMSIS_Driver/Driver_QSPI_Flash.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/CMSIS_Driver/Driver_GFC100_EFlash.c
+ CMSIS_Driver/Driver_QSPI_Flash.c
+ CMSIS_Driver/Driver_GFC100_EFlash.c
CMSIS_Driver/Driver_MPC.c
CMSIS_Driver/Driver_PPC.c
CMSIS_Driver/Driver_USART.c
@@ -101,10 +99,10 @@
Native_Driver/mpu_armv8m_drv.c
Native_Driver/ppc_sse200_drv.c
Native_Driver/gpio_cmsdk_drv.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries/mt25ql_flash_lib.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver/qspi_ip6514e_drv.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver/gfc100_eflash_drv.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver/musca_b1_eflash_drv.c
+ Libraries/mt25ql_flash_lib.c
+ Native_Driver/qspi_ip6514e_drv.c
+ Native_Driver/gfc100_eflash_drv.c
+ Native_Driver/musca_b1_eflash_drv.c
Native_Driver/musca_b1_scc_drv.c
Native_Driver/ppc_sse200_drv.c
Native_Driver/uart_pl011_drv.c
@@ -147,8 +145,8 @@
Device/Include
Native_Driver
services/include
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries
+ Native_Driver
+ Libraries
)
#========================= Platform BL2 =======================================#
@@ -158,11 +156,11 @@
PRIVATE
Device/Source/system_core_init.c
Device/Source/device_definition.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/CMSIS_Driver/Driver_GFC100_EFlash.c
+ CMSIS_Driver/Driver_GFC100_EFlash.c
Native_Driver/uart_pl011_drv.c
CMSIS_Driver/Driver_USART.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver/gfc100_eflash_drv.c
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver/musca_b1_eflash_drv.c
+ Native_Driver/gfc100_eflash_drv.c
+ Native_Driver/musca_b1_eflash_drv.c
Native_Driver/musca_b1_scc_drv.c
)
@@ -171,7 +169,7 @@
partition
Device/Include
INTERFACE
- ${CMAKE_MUSCA_B1_COMMON_DIR}/cc312
+ cc312
PRIVATE
.
CMSIS_Driver/Config
@@ -179,8 +177,8 @@
Native_Driver
${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
${CMAKE_BINARY_DIR}/bl2/ext/mcuboot # for mcuboot_config.h only
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Native_Driver
- ${CMAKE_MUSCA_B1_COMMON_DIR}/Libraries
+ Native_Driver
+ Libraries
)
endif()
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_b1/Device/Config/device_cfg.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Config/device_cfg.h
rename to platform/ext/target/arm/musca_b1/Device/Config/device_cfg.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/cmsis.h b/platform/ext/target/arm/musca_b1/Device/Include/cmsis.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/cmsis.h
rename to platform/ext/target/arm/musca_b1/Device/Include/cmsis.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/device_definition.h b/platform/ext/target/arm/musca_b1/Device/Include/device_definition.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/device_definition.h
rename to platform/ext/target/arm/musca_b1/Device/Include/device_definition.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_base_address.h b/platform/ext/target/arm/musca_b1/Device/Include/platform_base_address.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_base_address.h
rename to platform/ext/target/arm/musca_b1/Device/Include/platform_base_address.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_description.h b/platform/ext/target/arm/musca_b1/Device/Include/platform_description.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_description.h
rename to platform/ext/target/arm/musca_b1/Device/Include/platform_description.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_irq.h b/platform/ext/target/arm/musca_b1/Device/Include/platform_irq.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_irq.h
rename to platform/ext/target/arm/musca_b1/Device/Include/platform_irq.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_pins.h b/platform/ext/target/arm/musca_b1/Device/Include/platform_pins.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_pins.h
rename to platform/ext/target/arm/musca_b1/Device/Include/platform_pins.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_regs.h b/platform/ext/target/arm/musca_b1/Device/Include/platform_regs.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/platform_regs.h
rename to platform/ext/target/arm/musca_b1/Device/Include/platform_regs.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Include/system_core_init.h b/platform/ext/target/arm/musca_b1/Device/Include/system_core_init.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Include/system_core_init.h
rename to platform/ext/target/arm/musca_b1/Device/Include/system_core_init.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct b/platform/ext/target/arm/musca_b1/Device/Source/armclang/musca_bl2.sct
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_bl2.sct
rename to platform/ext/target/arm/musca_b1/Device/Source/armclang/musca_bl2.sct
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct b/platform/ext/target/arm/musca_b1/Device/Source/armclang/musca_ns.sct
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/musca_ns.sct
rename to platform/ext/target/arm/musca_b1/Device/Source/armclang/musca_ns.sct
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s b/platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_bl2.s
rename to platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_bl2.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s b/platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_ns.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_ns.s
rename to platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_ns.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s b/platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_s.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/armclang/startup_cmsdk_musca_s.s
rename to platform/ext/target/arm/musca_b1/Device/Source/armclang/startup_cmsdk_musca_s.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/device_definition.c b/platform/ext/target/arm/musca_b1/Device/Source/device_definition.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/device_definition.c
rename to platform/ext/target/arm/musca_b1/Device/Source/device_definition.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld b/platform/ext/target/arm/musca_b1/Device/Source/gcc/musca_bl2.ld
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_bl2.ld
rename to platform/ext/target/arm/musca_b1/Device/Source/gcc/musca_bl2.ld
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld b/platform/ext/target/arm/musca_b1/Device/Source/gcc/musca_ns.ld
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/musca_ns.ld
rename to platform/ext/target/arm/musca_b1/Device/Source/gcc/musca_ns.ld
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S b/platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_bl2.S
rename to platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_bl2.S
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S b/platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_ns.S
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_ns.S
rename to platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_ns.S
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S b/platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_s.S
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/gcc/startup_cmsdk_musca_s.S
rename to platform/ext/target/arm/musca_b1/Device/Source/gcc/startup_cmsdk_musca_s.S
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/musca_bl2.icf b/platform/ext/target/arm/musca_b1/Device/Source/iar/musca_bl2.icf
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/musca_bl2.icf
rename to platform/ext/target/arm/musca_b1/Device/Source/iar/musca_bl2.icf
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/musca_ns.icf b/platform/ext/target/arm/musca_b1/Device/Source/iar/musca_ns.icf
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/musca_ns.icf
rename to platform/ext/target/arm/musca_b1/Device/Source/iar/musca_ns.icf
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_bl2.s b/platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_bl2.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_bl2.s
rename to platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_bl2.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_ns.s b/platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_ns.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_ns.s
rename to platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_ns.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_s.s b/platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_s.s
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/iar/startup_cmsdk_musca_s.s
rename to platform/ext/target/arm/musca_b1/Device/Source/iar/startup_cmsdk_musca_s.s
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Device/Source/system_core_init.c b/platform/ext/target/arm/musca_b1/Device/Source/system_core_init.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Device/Source/system_core_init.c
rename to platform/ext/target/arm/musca_b1/Device/Source/system_core_init.c
diff --git a/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.c b/platform/ext/target/arm/musca_b1/Libraries/mt25ql_flash_lib.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.c
rename to platform/ext/target/arm/musca_b1/Libraries/mt25ql_flash_lib.c
diff --git a/platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.h b/platform/ext/target/arm/musca_b1/Libraries/mt25ql_flash_lib.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Libraries/mt25ql_flash_lib.h
rename to platform/ext/target/arm/musca_b1/Libraries/mt25ql_flash_lib.h
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/gfc100_eflash_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/gfc100_eflash_drv.c
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/gfc100_eflash_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_eflash_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/gfc100_eflash_drv.h
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_process_spec_api.h b/platform/ext/target/arm/musca_b1/Native_Driver/gfc100_process_spec_api.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/gfc100_process_spec_api.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/gfc100_process_spec_api.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/gpio_cmsdk_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/gpio_cmsdk_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/gpio_cmsdk_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/gpio_cmsdk_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/gpio_cmsdk_drv.h
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.c b/platform/ext/target/arm/musca_b1/Native_Driver/mhu_v2_x.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/mhu_v2_x.c
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.h b/platform/ext/target/arm/musca_b1/Native_Driver/mhu_v2_x.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/mhu_v2_x.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/mhu_v2_x.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/mpc_sie200_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/mpc_sie200_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/mpc_sie200_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpc_sie200_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/mpc_sie200_drv.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/mpu_armv8m_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/mpu_armv8m_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/mpu_armv8m_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/mpu_armv8m_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/mpu_armv8m_drv.h
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_eflash_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/musca_b1_eflash_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_eflash_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_scc_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_scc_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_scc_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/musca_b1_scc_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/musca_b1_scc_drv.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/ppc_sse200_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/ppc_sse200_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/ppc_sse200_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/ppc_sse200_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/ppc_sse200_drv.h
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/qspi_ip6514e_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/qspi_ip6514e_drv.c
diff --git a/platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/qspi_ip6514e_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/Native_Driver/qspi_ip6514e_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/qspi_ip6514e_drv.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/timer_cmsdk_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/timer_cmsdk_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/timer_cmsdk_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/timer_cmsdk_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/timer_cmsdk_drv.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c b/platform/ext/target/arm/musca_b1/Native_Driver/uart_pl011_drv.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.c
rename to platform/ext/target/arm/musca_b1/Native_Driver/uart_pl011_drv.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h b/platform/ext/target/arm/musca_b1/Native_Driver/uart_pl011_drv.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/Native_Driver/uart_pl011_drv.h
rename to platform/ext/target/arm/musca_b1/Native_Driver/uart_pl011_drv.h
diff --git a/platform/ext/target/arm/musca_b1/common/cc312/dx_reg_base_host.h b/platform/ext/target/arm/musca_b1/cc312/dx_reg_base_host.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/common/cc312/dx_reg_base_host.h
rename to platform/ext/target/arm/musca_b1/cc312/dx_reg_base_host.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/config.cmake b/platform/ext/target/arm/musca_b1/config.cmake
similarity index 97%
rename from platform/ext/target/arm/musca_b1/sse_200/config.cmake
rename to platform/ext/target/arm/musca_b1/config.cmake
index d1725d5..713f4bf 100644
--- a/platform/ext/target/arm/musca_b1/sse_200/config.cmake
+++ b/platform/ext/target/arm/musca_b1/config.cmake
@@ -34,7 +34,7 @@
endif()
if(PLATFORM_GPLED_ENABLED)
- #If required, Musca_b1_sse_200 platform supports GPLED services
+ #If required, Musca_b1 platform supports GPLED services
set(PLATFORM_GPLED_SUPPORTED ON CACHE BOOL "Whether to enable the gpled functionality on supported platforms")
else()
#By default, GPLED support is disabled
diff --git a/platform/ext/target/arm/musca_b1/sse_200/mmio_defs.h b/platform/ext/target/arm/musca_b1/mmio_defs.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/mmio_defs.h
rename to platform/ext/target/arm/musca_b1/mmio_defs.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/partition/flash_layout.h b/platform/ext/target/arm/musca_b1/partition/flash_layout.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/partition/flash_layout.h
rename to platform/ext/target/arm/musca_b1/partition/flash_layout.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/partition/region_defs.h b/platform/ext/target/arm/musca_b1/partition/region_defs.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/partition/region_defs.h
rename to platform/ext/target/arm/musca_b1/partition/region_defs.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/plat_test.c b/platform/ext/target/arm/musca_b1/plat_test.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/plat_test.c
rename to platform/ext/target/arm/musca_b1/plat_test.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/preload.cmake b/platform/ext/target/arm/musca_b1/preload.cmake
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/preload.cmake
rename to platform/ext/target/arm/musca_b1/preload.cmake
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_gpled_api.h b/platform/ext/target/arm/musca_b1/services/include/tfm_gpled_api.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_gpled_api.h
rename to platform/ext/target/arm/musca_b1/services/include/tfm_gpled_api.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_ioctl_api.h b/platform/ext/target/arm/musca_b1/services/include/tfm_ioctl_api.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/services/include/tfm_ioctl_api.h
rename to platform/ext/target/arm/musca_b1/services/include/tfm_ioctl_api.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_gpled_api.c b/platform/ext/target/arm/musca_b1/services/src/tfm_gpled_api.c
similarity index 96%
rename from platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_gpled_api.c
rename to platform/ext/target/arm/musca_b1/services/src/tfm_gpled_api.c
index 7b48186..7261df7 100644
--- a/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_gpled_api.c
+++ b/platform/ext/target/arm/musca_b1/services/src/tfm_gpled_api.c
@@ -11,7 +11,7 @@
#include "platform_pins.h"
/*
- * Musca-B1 sse_200 Platform specific GPLED pin defs
+ * Musca-B1 Platform specific GPLED pin defs
*/
#define RED_LED AHB_GPIO0_2
#define GREEN_LED AHB_GPIO0_3
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/arm/musca_b1/services/src/tfm_ioctl_ns_api.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_ns_api.c
rename to platform/ext/target/arm/musca_b1/services/src/tfm_ioctl_ns_api.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c b/platform/ext/target/arm/musca_b1/services/src/tfm_ioctl_s_api.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_ioctl_s_api.c
rename to platform/ext/target/arm/musca_b1/services/src/tfm_ioctl_s_api.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_platform_system.c b/platform/ext/target/arm/musca_b1/services/src/tfm_platform_system.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/services/src/tfm_platform_system.c
rename to platform/ext/target/arm/musca_b1/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/spm_hal.c b/platform/ext/target/arm/musca_b1/spm_hal.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/spm_hal.c
rename to platform/ext/target/arm/musca_b1/spm_hal.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/target_cfg.c b/platform/ext/target/arm/musca_b1/target_cfg.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/target_cfg.c
rename to platform/ext/target/arm/musca_b1/target_cfg.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/target_cfg.h b/platform/ext/target/arm/musca_b1/target_cfg.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/target_cfg.h
rename to platform/ext/target/arm/musca_b1/target_cfg.h
diff --git a/platform/ext/target/arm/musca_b1/sse_200/tfm_hal_isolation.c b/platform/ext/target/arm/musca_b1/tfm_hal_isolation.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/tfm_hal_isolation.c
rename to platform/ext/target/arm/musca_b1/tfm_hal_isolation.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/tfm_hal_platform.c b/platform/ext/target/arm/musca_b1/tfm_hal_platform.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/tfm_hal_platform.c
rename to platform/ext/target/arm/musca_b1/tfm_hal_platform.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/tfm_interrupts.c b/platform/ext/target/arm/musca_b1/tfm_interrupts.c
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/tfm_interrupts.c
rename to platform/ext/target/arm/musca_b1/tfm_interrupts.c
diff --git a/platform/ext/target/arm/musca_b1/sse_200/tfm_peripherals_def.h b/platform/ext/target/arm/musca_b1/tfm_peripherals_def.h
similarity index 100%
rename from platform/ext/target/arm/musca_b1/sse_200/tfm_peripherals_def.h
rename to platform/ext/target/arm/musca_b1/tfm_peripherals_def.h