commit e40f9a2701f9c1b89e638e047567ef37444630aa
author Ken Liu <ken.liu@arm.com> Mon Jun 03 16:42:47 2019 +0800
committer Ken Liu <ken.liu@arm.com> Fri Jun 21 02:07:15 2019 +0000
tree 5d7f7852fd4baf9ac3e6b9dbec54dd1d54e335ae
parent efa7f2a4d2ea9b8295ad0e757bd202747e8bcb6f

Build: Move configurations into a specified directory

Configurations are increasing and cause root directory looks not very
clear. Move configurations into a specified directory. Related changes
in projects need to be made due to config file change. And create fake
config files with the same name under the root directory, link to the
config files under 'configs' to provide compatibility temporarily.

Change-Id: I420b7a567e96d6540b5cd9697b08575d89274fe4
Signed-off-by: Ken Liu <ken.liu@arm.com>

cmake/Common/BuildSys.cmake

diff --git a/cmake/Common/BuildSys.cmake b/cmake/Common/BuildSys.cmake
index 370f275..4de9f3b 100644
--- a/cmake/Common/BuildSys.cmake
+++ b/cmake/Common/BuildSys.cmake
@@ -37,9 +37,9 @@
 #	To use global project config:
 #		embedded_project_start()
 #	To use config file relative to the top level CmakeLists.txt:
-#		embedded_project_start(./ConfigDefault.cmake)
+#		embedded_project_start(./configs/ConfigDefault.cmake)
 #	To use config file relative to the CmakeLists.txt file where this macro is used:
-#		embedded_project_start(${CMAKE_CURRENT_LIST_DIR}/ConfigDefault.cmake)
+#		embedded_project_start(${TFM_ROOT_DIR}/configs/ConfigDefault.cmake)
 macro(embedded_project_start)
 	#Default project configuration file
 	if (DEFINED PROJ_CONFIG) #Take the global setting as default value
@@ -51,10 +51,10 @@
 	set( _MULTI_VALUE_ARGS )		#One list argument (e.g. LANGUAGES C ASM CXX)
 	cmake_parse_arguments(_MY_PARAMS "${_OPTIONS_ARGS}" "${_ONE_VALUE_ARGS}" "${_MULTI_VALUE_ARGS}" ${ARGN} )
 
-	#Cehck passed parameters
+	#Check passed parameters
 	if(NOT _MY_PARAMS_CONFIG)
 		if(NOT DEFINED _PROJ_CONFIG)
-			set(_PROJ_CONFIG "./ConfigDefault.cmake")
+			set(_PROJ_CONFIG "${TFM_ROOT_DIR}/configs/ConfigDefault.cmake")
 			message(STATUS "embedded_project_start: no project configuration file defined, falling back to default.")
 		endif()
 	elseif(NOT DEFINED PROJ_CONFIG)
@@ -62,7 +62,7 @@
 	endif()
 
 	get_filename_component(_ABS_PROJ_CONFIG ${_PROJ_CONFIG} ABSOLUTE)
-	message( STATUS "embedded_project_start: using project specific config file (PROJ_CONFIG = ${_ABS_PROJ_CONFIG})")
+	message(STATUS "embedded_project_start: using project specific config file (PROJ_CONFIG = ${_ABS_PROJ_CONFIG})")
 	include("${_PROJ_CONFIG}")
 endmacro()