Fix #633, Explicit toolchain in sample target.cmake

nasa · Nov 10, 2022 · ffca45a · ffca45a
1 parent 7a220ae
commit ffca45a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 56 deletions.
diff --git a/cmake/sample_defs/targets.cmake b/cmake/sample_defs/targets.cmake
@@ -104,10 +104,12 @@ SET(MISSION_CPUNAMES cpu1)
 SET(cpu1_PROCESSORID 1)
 SET(cpu1_APPLIST ci_lab to_lab sch_lab)
 SET(cpu1_FILELIST cfe_es_startup.scr)
+SET(cpu1_SYSTEM i686-linux-gnu)
 
 # CPU2 example.  This is not built by default anymore but
 # serves as an example of how one would configure multiple cpus.
 SET(cpu2_PROCESSORID 2)
 SET(cpu2_APPLIST ci_lab to_lab sch_lab)
 SET(cpu2_FILELIST cfe_es_startup.scr)
+SET(cpu2_SYSTEM i686-linux-gnu)
 
diff --git a/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake b/cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
@@ -30,6 +30,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE	ONLY)
 # abstraction layers are built when using this toolchain
 # Note that "pc-linux" works fine even though this is not technically a "pc"
 SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPTYPE     "pc-linux")
 SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-cpu2.cmake b/cmake/sample_defs/toolchain-cpu2.cmake
diff --git a/cmake/sample_defs/toolchain-cpu3.cmake b/cmake/sample_defs/toolchain-cpu3.cmake
diff --git a/cmake/sample_defs/toolchain-cpu1.cmake → ...ample_defs/toolchain-i686-linux-gnu.cmake b/cmake/sample_defs/toolchain-cpu1.cmake → ...ample_defs/toolchain-i686-linux-gnu.cmake
@@ -20,6 +20,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   NEVER)
 # These variable settings are specific to cFE/OSAL and determines which 
 # abstraction layers are built when using this toolchain
 SET(CFE_SYSTEM_PSPNAME      "pc-linux")
-SET(OSAL_SYSTEM_BSPNAME     "pc-linux")
 SET(OSAL_SYSTEM_OSTYPE      "posix")
-
diff --git a/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake b/cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
@@ -33,6 +33,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE	ONLY)
 # these settings are specific to cFE/OSAL and determines
 # which abstraction layers are built when this toolchain is used
 SET(CFE_SYSTEM_PSPNAME			pc-linux)
-SET(OSAL_SYSTEM_BSPTYPE			pc-linux)
 SET(OSAL_SYSTEM_OSTYPE			posix)
-