From 9520817de7442ddabe29be38f01f3ff3d7b945a9 Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Fri, 9 Aug 2019 06:54:05 +0100
Subject: [PATCH] CMSIS-DSP: Test framework Added possibility to select an
 external platform folder.

---
 config.cmake         |  4 ++--
 configPlatform.cmake | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/config.cmake b/config.cmake
index 284200cf..6c52fc25 100755
--- a/config.cmake
+++ b/config.cmake
@@ -1,5 +1,5 @@
 include(Toolchain/Tools)
-SET(PLATFORMFOLDER "FVP")
+SET(PLATFORMFOLDER ${ROOT}/CMSIS/DSP/Platforms/FVP)
 option(OPTIMIZED "Compile for speed" ON)
 include(configPlatform)
 include(configBoot)
@@ -27,7 +27,7 @@ endfunction()
 # Config app
 function (configApp project cmsisRoot)
   configcore(${project} ${cmsisRoot})
-  configboot(${project} ${cmsisRoot} ${cmsisRoot}/CMSIS/DSP/Platforms/${PLATFORMFOLDER})
+  configboot(${project} ${cmsisRoot} ${PLATFORMFOLDER})
   set_platform_core()
   core_includes(${project})
   SET(PLATFORMID ${PLATFORMID} PARENT_SCOPE)
diff --git a/configPlatform.cmake b/configPlatform.cmake
index 4fa12f23..c08f930b 100644
--- a/configPlatform.cmake
+++ b/configPlatform.cmake
@@ -1,17 +1,15 @@
 option(SEMIHOSTING "Test trace using printf" ON)
-SET(PLATFORM "FVP")
-
 
 if (PLATFORM STREQUAL "FVP")
-SET(PLATFORMFOLDER "FVP")
+SET(PLATFORMFOLDER ${ROOT}/CMSIS/DSP/Platforms/FVP)
 SET(PLATFORMID "FVP")
 list(APPEND CMAKE_MODULE_PATH ${ROOT}/CMSIS/DSP/Platforms/FVP)
 endif()
 
 if (PLATFORM STREQUAL "SDSIM")
-SET(PLATFORMFOLDER "SDSIM")
+SET(PLATFORMFOLDER ${SDSIMROOT})
 SET(PLATFORMID "SDSIM")
-list(APPEND CMAKE_MODULE_PATH ${ROOT}/CMSIS/DSP/Platforms/SDSIM)
+list(APPEND CMAKE_MODULE_PATH ${SDSIMROOT})
 endif()
 
 SET(CORE ARMCM7)
@@ -117,7 +115,7 @@ function(set_platform_core)
 endfunction()
 
 function(core_includes PROJECTNAME)
-    target_include_directories(${PROJECTNAME} PRIVATE ${ROOT}/CMSIS/DSP/Platforms/${PLATFORMFOLDER}/${CORE}/Include)
+    target_include_directories(${PROJECTNAME} PRIVATE ${PLATFORMFOLDER}/${CORE}/Include)
 endfunction()
 
 function (configplatformForLib PROJECTNAME ROOT)