From d3551bf1234a4dd51fdae251635348e23b9e057d Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Thu, 26 Sep 2019 08:48:51 +0100
Subject: [PATCH] CMSIS-DSP: Corrected issue in test framework to support
 experimental configs.

---
 .gitattributes                                       |  4 ++--
 .../Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct  |  2 +-
 CMSIS/DSP/Testing/CMakeLists.txt                     | 12 ++++++------
 CMSIS/DSP/config.cmake                               |  2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 939926f67f..cc5783f111 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
 *.c text
-*.h text
+*.h binary
 *.txt text
 *.xsd text
 *.pdsc text
@@ -18,4 +18,4 @@
 *.a filter=lfs diff=lfs merge=lfs -text
 *.lib filter=lfs diff=lfs merge=lfs -text
 *.exe filter=lfs diff=lfs merge=lfs -text
-CMSIS/Utilities/Linux-gcc-*/* filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
+CMSIS/Utilities/Linux-gcc-*/* filter=lfs diff=lfs merge=lfs -text
diff --git a/CMSIS/DSP/Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct b/CMSIS/DSP/Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct
index 4cc0dc92c8..82330f67e9 100755
--- a/CMSIS/DSP/Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct
+++ b/CMSIS/DSP/Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct
@@ -14,7 +14,7 @@
 ; </h>
  *----------------------------------------------------------------------------*/
 #define __ROM_BASE     0x10000000
-#define __ROM_SIZE     0x00100000
+#define __ROM_SIZE     0x00200000
 
 /*--------------------- Embedded RAM Configuration ---------------------------
 ; <h> RAM Configuration
diff --git a/CMSIS/DSP/Testing/CMakeLists.txt b/CMSIS/DSP/Testing/CMakeLists.txt
index acb79a3d70..42e189c158 100644
--- a/CMSIS/DSP/Testing/CMakeLists.txt
+++ b/CMSIS/DSP/Testing/CMakeLists.txt
@@ -77,7 +77,11 @@ project(Testing)
 set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 
 
-
+# Change behavior of configBoot for scatter file
+# We use the linker files from older test framework because bigger sections are needed.
+# We should migrate the linker files to this new framework.
+set(TESTFRAMEWORK ON)
+include(config)
 
 add_subdirectory(../Source bin_dsp)
 add_subdirectory(${ROOT}/CMSIS/NN/Source bin_nn)
@@ -167,11 +171,7 @@ set(FRAMEWORKSRC
   FrameworkSource/Generators.cpp
   FrameworkSource/Calibrate.cpp
   )
-# Change behavior of configBoot for scatter file
-# We use the linker files from older test framework because bigger sections are needed.
-# We should migrate the linker files to this new framework.
-set(TESTFRAMEWORK ON)
-include(config)
+
 
 # With -O2, generated code is crashing on some cycle accurate models.
 # (cpp part)
diff --git a/CMSIS/DSP/config.cmake b/CMSIS/DSP/config.cmake
index ebe23029a6..693bf9067f 100755
--- a/CMSIS/DSP/config.cmake
+++ b/CMSIS/DSP/config.cmake
@@ -1,3 +1,5 @@
+include(CMakePrintHelpers)
+
 if(EXPERIMENTAL)
 list(APPEND CMAKE_MODULE_PATH ${EXPROOT})
 include(experimental)