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 #162, reference generic OSAL BSP #164

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Fix #162, reference generic OSAL BSP #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39760aa
Merge pull request #166 from nasa/integration-candidate
astrogeco May 29, 2020
f55e3ca
Fix #162, Reference the generic OSAL BSP.
jphickey May 14, 2020
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
15 changes: 15 additions & 0 deletions fsw/mcp750-vxworks/make/build_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,18 @@ set(INSTALL_SUBDIR "cf")
# but no CFE/OSAL framework code depends on this symbol.
add_definitions("-D_VXWORKS_OS_")


# Use the mcp750-specific VxWorks BSP include directory
# This needs to be globally used, not just private to the PSP, because
# some VxWorks headers reference files contained here.
include_directories(
${WIND_BASE}/target/config/mcp750
)

# NOTE: the __PPC__ and MCP750 macros are referenced in some system headers.
# therefore all code compiled for this platform should always define these symbols.
add_definitions("-D__PPC__")
add_definitions("-DMCP750")

set(CFE_PSP_EXPECTED_OSAL_BSPTYPE "generic-vxworks")

2 changes: 2 additions & 0 deletions fsw/pc-linux/make/build_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ set(INSTALL_SUBDIR "cf")
# but no CFE/OSAL framework code depends on this symbol.
add_definitions("-D_LINUX_OS_")

set(CFE_PSP_EXPECTED_OSAL_BSPTYPE "generic-linux")