Merge pull request #167 from nasa/integration-candidate

Integration Candidate: 2020-05-27
nasa · Jun 10, 2020 · 4703df2 · 4703df2
2 parents 39760aa + 9c73152
commit 4703df2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ This is a collection of APIs abstracting platform specific functionality to be l
 
 ## Version History
 
+### Development Build: 1.4.13
+
+- Changes the PSP reference to be compatible with the change in nasa/osal#449 making the BSP modules more generic and changes the name.
+- See <https://github.com/nasa/PSP/pull/167>
+
 ### Development Build: 1.4.12
 
 - Replace 'OS_VolumeTable' with OS_FileSysAddFixedMap() in all PSPs.

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               12
+#define CFE_PSP_IMPL_REVISION               13
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */
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/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               12
+#define CFE_PSP_IMPL_REVISION               13
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */
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")
+
diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -35,7 +35,7 @@
 */
 #define CFE_PSP_IMPL_MAJOR_VERSION          1
 #define CFE_PSP_IMPL_MINOR_VERSION          4
-#define CFE_PSP_IMPL_REVISION               12
+#define CFE_PSP_IMPL_REVISION               13
 #define CFE_PSP_IMPL_MISSION_REV            0
 
 #endif  /* _psp_version_ */
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")