Merge pull request #164 from jphickey/fix-162-generic-bsp

Fix #162, reference generic OSAL BSP
nasa · Jun 2, 2020 · 6e0c7a5 · 6e0c7a5
2 parents 0b64c95 + f55e3ca
commit 6e0c7a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/fsw/mcp750-vxworks/make/build_options.cmake b/fsw/mcp750-vxworks/make/build_options.cmake
@@ -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")
+
diff --git a/fsw/pc-linux/make/build_options.cmake b/fsw/pc-linux/make/build_options.cmake
@@ -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")
+