Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #633, Explicit toolchain in sample target.cmake #2203

Merged
merged 1 commit into from
Nov 28, 2022
Merged

Fix #633, Explicit toolchain in sample target.cmake #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/sample_defs/targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 0 additions & 2 deletions cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

25 changes: 0 additions & 25 deletions cmake/sample_defs/toolchain-cpu2.cmake
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions cmake/sample_defs/toolchain-cpu3.cmake
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions cmake/sample_defs/toolchain-cpu1.cmake → ...ample_defs/toolchain-i686-linux-gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

2 changes: 0 additions & 2 deletions cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)