Skip to content

Commit

Permalink
CMSIS-DSP: Corrected issue in test framework to support experimental …
Browse files Browse the repository at this point in the history
…configs.
  • Loading branch information
christophe0606 committed Sep 26, 2019
1 parent 7814e32 commit d3551bf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
CMSIS/Utilities/Linux-gcc-*/* filter=lfs diff=lfs merge=lfs -text
2 changes: 1 addition & 1 deletion CMSIS/DSP/Platforms/FVP/ARMv81MML/LinkScripts/AC6/lnk.sct
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
; </h>
*----------------------------------------------------------------------------*/
#define __ROM_BASE 0x10000000
#define __ROM_SIZE 0x00100000
#define __ROM_SIZE 0x00200000

/*--------------------- Embedded RAM Configuration ---------------------------
; <h> RAM Configuration
Expand Down
12 changes: 6 additions & 6 deletions CMSIS/DSP/Testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions CMSIS/DSP/config.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include(CMakePrintHelpers)

if(EXPERIMENTAL)
list(APPEND CMAKE_MODULE_PATH ${EXPROOT})
include(experimental)
Expand Down

0 comments on commit d3551bf

Please sign in to comment.