Platform: relocate common folder
This patch relocates common folder to
platform/ext, as the code in this folder
uses target resources.
Change-Id: Iaa2a3682c150ec36a8d4818ea2f42e62de7d8ed9
Signed-off-by: Marc Moreno <marc.morenoberengue@arm.com>
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index 75960c4..1040b3c 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -91,7 +91,7 @@
##TF-M storage
config_setting_shared_flags(tfm_storage)
-set(MBEDTLS_C_FLAGS "-D__ARM_FEATURE_CMSE=3 -D__thumb2__ -fshort-enums -mfpu=none -fshort-wchar -funsigned-char -mcmse -DMBEDTLS_CONFIG_FILE=\\\\\\\"mbedtls_config.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/platform/ext/target/common")
+set(MBEDTLS_C_FLAGS "-D__ARM_FEATURE_CMSE=3 -D__thumb2__ -fshort-enums -mfpu=none -fshort-wchar -funsigned-char -mcmse -DMBEDTLS_CONFIG_FILE=\\\\\\\"mbedtls_config.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/platform/ext/common")
set (SST_ENCRYPTION ON)
set (SST_RAM_FS ON)
diff --git a/platform/ext/Mps2AN521.cmake b/platform/ext/Mps2AN521.cmake
index dea5de8..80190f4 100644
--- a/platform/ext/Mps2AN521.cmake
+++ b/platform/ext/Mps2AN521.cmake
@@ -33,8 +33,8 @@
if (NOT DEFINED BUILD_UART_STDOUT)
message(FATAL_ERROR "Configuration variable BUILD_UART_STDOUT (true|false) is undefined!")
elseif(BUILD_UART_STDOUT)
- LIST(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/common/uart_stdout.c")
- embedded_include_directories(PATH "${PLATFORM_DIR}/target/common" ABSOLUTE)
+ LIST(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/uart_stdout.c")
+ embedded_include_directories(PATH "${PLATFORM_DIR}/common" ABSOLUTE)
set(BUILD_NATIVE_DRIVERS true)
set(BUILD_CMSIS_DRIVERS true)
endif()
@@ -93,6 +93,6 @@
if (NOT DEFINED BUILD_FLASH)
message(FATAL_ERROR "Configuration variable BUILD_FLASH (true|false) is undefined!")
elseif(BUILD_FLASH)
- list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/common/flash_memory_mapped.c")
- embedded_include_directories(PATH "${PLATFORM_DIR}/target/common" ABSOLUTE)
+ list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/flash_memory_mapped.c")
+ embedded_include_directories(PATH "${PLATFORM_DIR}/common" ABSOLUTE)
endif()
diff --git a/platform/ext/target/common/flash.h b/platform/ext/common/flash.h
similarity index 100%
rename from platform/ext/target/common/flash.h
rename to platform/ext/common/flash.h
diff --git a/platform/ext/target/common/flash_memory_mapped.c b/platform/ext/common/flash_memory_mapped.c
similarity index 100%
rename from platform/ext/target/common/flash_memory_mapped.c
rename to platform/ext/common/flash_memory_mapped.c
diff --git a/platform/ext/target/common/mbedtls_config.h b/platform/ext/common/mbedtls_config.h
similarity index 100%
rename from platform/ext/target/common/mbedtls_config.h
rename to platform/ext/common/mbedtls_config.h
diff --git a/platform/ext/target/common/uart_stdout.c b/platform/ext/common/uart_stdout.c
similarity index 100%
rename from platform/ext/target/common/uart_stdout.c
rename to platform/ext/common/uart_stdout.c
diff --git a/platform/ext/target/common/uart_stdout.h b/platform/ext/common/uart_stdout.h
similarity index 100%
rename from platform/ext/target/common/uart_stdout.h
rename to platform/ext/common/uart_stdout.h
diff --git a/platform/ext/readme.md b/platform/ext/readme.md
index 4c8f2fe..7b94540 100644
--- a/platform/ext/readme.md
+++ b/platform/ext/readme.md
@@ -15,16 +15,20 @@
This folder contains core and compiler specific header files imported from the
CMSIS_5 project.
+### common
+This folder contains stdout redirection to UART, a temporary memory mapped
+flash implementation for the bootloader and mbedtls_config.h for all
+the targets.
+
### drivers
This folder contains the headers with CMSIS compliant driver definitions that
that TF-M project expects a target to provide.
### target
-This folder contains the files for individual target and also any wrapper that
-can be across targets.
+This folder contains the files for individual target.
--------------
-*Copyright (c) 2017, Arm Limited. All rights reserved.*
+*Copyright (c) 2017-2018, Arm Limited. All rights reserved.*