diff --git a/ConfigDefault.cmake b/ConfigDefault.cmake
index 02011c4..6812396 100644
--- a/ConfigDefault.cmake
+++ b/ConfigDefault.cmake
@@ -1,37 +1,14 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2017-2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 #-------------------------------------------------------------------------------
 
-#This file holds information of a specific build configuration of this project.
+message(WARNING "Please use the configs available in the ./config sub-directory.")
 
-#Include board specific config (CPU, etc...), select platform specific build
-#system settings file
-if(NOT DEFINED TARGET_PLATFORM)
-	message(FATAL_ERROR "ERROR: TARGET_PLATFORM is not set in command line")
-elseif(${TARGET_PLATFORM} STREQUAL "AN521")
-	set(PLATFORM_CMAKE_FILE "${CMAKE_CURRENT_LIST_DIR}/platform/ext/Mps2AN521.cmake")
-elseif(${TARGET_PLATFORM} STREQUAL "AN519")
-	set (PLATFORM_CMAKE_FILE "${CMAKE_CURRENT_LIST_DIR}/platform/ext/Mps2AN519.cmake")
-elseif(${TARGET_PLATFORM} STREQUAL "MUSCA_A")
-	set(PLATFORM_CMAKE_FILE "${CMAKE_CURRENT_LIST_DIR}/platform/ext/musca_a.cmake")
-elseif(${TARGET_PLATFORM} STREQUAL "MUSCA_B1")
-	set(PLATFORM_CMAKE_FILE "${CMAKE_CURRENT_LIST_DIR}/platform/ext/musca_b1.cmake")
-else()
-	message(FATAL_ERROR "ERROR: Target \"${TARGET_PLATFORM}\" is not supported.")
+if(NOT DEFINED TFM_ROOT_DIR)
+	message(FATAL_ERROR "Variable TFM_ROOT_DIR is not set!")
 endif()
 
-##These variables select how the projects are built. Each project will set
-#various project specific settings (e.g. what files to build, macro
-#definitions) based on these.
-set (REGRESSION False)
-set (CORE_TEST False)
-set (CORE_IPC False)
-set (PSA_API_TEST False)
-
-# TF-M isolation level: 1..3
-set (TFM_LVL 1)
-
-include ("${CMAKE_CURRENT_LIST_DIR}/CommonConfig.cmake")
+include ("${TFM_ROOT_DIR}/configs/ConfigDefault.cmake")