christoph/fail
1
Fork 0
Code Releases Activity

Merge branch 'master' of ssh://vamos.informatik.uni-erlangen.de:29418/fail

Browse Source 
Change-Id: I35e86d4b367be395121451a86f2731606f43eeff
This commit is contained in:
Martin Hoffmann
2013-03-22 16:21:30 +01:00
parent 3c349e06f3 1e5581644c
commit 28fc41da65
17 changed files with 773 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/t32cmm/CMakeLists.txt
View File

@ -4,8 +4,10 @@ if(EXISTS $ENV{T32SYS})
SET(T32_SYS $ENV{T32SYS})
message(STATUS "[Fail*] T32 base directory: T32SYS=${T32_SYS}")
else()
message(FATAL_ERROR "Please set env variable T32SYS to a valid T32 installation base directory.")
SET(T32_SYS "/proj/i4ciao/tools/t32-20130226-qt") ## defaulting to I4 installation
#message(FATAL_ERROR "Please set env variable T32SYS to a valid T32 installation base directory.")
endif()
message(STATUS "[Fail*] T32 base directory: T32SYS=${T32_SYS}")
if(EXISTS $ENV{FAIL_ELF_PATH})
SET(T32_ELF_PATH $ENV{FAIL_ELF_PATH})
@ -37,7 +39,7 @@ message(STATUS "[Fail*] T32 CPU name: ${T32_CPUNAME}")
message(STATUS "[Fail*] T32 Executable: ${T32_EXE}")
add_custom_target(runt32
COMMAND T32CONFIG=${PROJECT_BINARY_DIR}/cmm/config.t32 ${T32_EXE} &
COMMAND T32CONFIG=${PROJECT_BINARY_DIR}/cmm/config.t32 T32SYS=${T32_SYS} ${T32_EXE} &
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/cmm"
COMMENT "Starting Lauterbach."
)

13
scripts/t32cmm/armm3/CMakeLists.txt
View File

@ -1,18 +1,5 @@
### Configure cmm Scripts for ARM Cortex-M3
if(EXISTS $ENV{T32SYS})
SET(T32_SYS $ENV{T32SYS})
else()
message(FATAL_ERROR "Please set env variable T32SYS to valid T32 installation base directory.")
endif(EXISTS $ENV{T32SYS})
if(T32_SIMULATOR)
set(T32_OFF_FOR_SIM ";")
else()
set(T32_OFF_FOR_SIM " ")
endif()
set(T32_EXE "${T32_EXE}/t32marm-qt" CACHE INTERNAL "")
set(T32_CPUNAME STM32F103RG CACHE PATH "CPU name for SYSTEM.CPU call. (e.g. STM32F103RG)")
configure_file(armm3cfg.cmm.in ${PROJECT_BINARY_DIR}/cmm/armm3cfg.cmm)