diff --git a/ConfigCoreTest.cmake b/ConfigCoreTest.cmake
index 7faeafc..6118ec6 100644
--- a/ConfigCoreTest.cmake
+++ b/ConfigCoreTest.cmake
@@ -7,20 +7,15 @@
 
 #This file holds information of a specific build configuration of this project.
 
-#Select platform specific build system settings file.
-set(PLATFORM_CMAKE_FILE "${CMAKE_CURRENT_LIST_DIR}/platform/ext/Mps2AN521.cmake")
-
-#Include board specific config (CPU, etc...)
-include("Common/BoardAN521")
-
-#Use any ARMCLANG version found on PATH. Note: Only versions supported by the
-#build system will work. A file cmake/Common/CompilerArmClangXY.cmake
-#must be present with a matching version.
-include("Common/FindArmClang")
-if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/cmake/Common/${ARMCLANG_MODULE}.cmake")
-    message(FATAL_ERROR "ERROR: Unsupported ARMCLANG compiler version found on PATH.")
+#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")
+else()
+	message(FATAL_ERROR "ERROR: Target \"${TARGET_PLATFORM}\" is not supported.")
 endif()
-include("Common/${ARMCLANG_MODULE}")
 
 ##These variables select how the projects are built. Each project will set
 #various project specific settings (e.g. what files to build, macro
@@ -30,4 +25,3 @@
 set (BL2 True)
 
 include ("${CMAKE_CURRENT_LIST_DIR}/CommonConfig.cmake")
-