Skip to content

Commit

Permalink
Fix nasa#162, Reference the generic OSAL BSP.
Browse files Browse the repository at this point in the history
With the latest OSAL BSP updates these no longer contain the system-specific
include file references or compile definitions that are specific to the
board/cpu.  This information needs to be in the PSP.
  • Loading branch information
jphickey committed Jun 1, 2020
1 parent 39760aa commit f55e3ca
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
15 changes: 15 additions & 0 deletions fsw/mcp750-vxworks/make/build_options.cmake
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
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")

0 comments on commit f55e3ca

Please sign in to comment.