From f55e3caa7d424ff53998686433b5e6cc16b8b37d Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 14 May 2020 12:08:10 -0400 Subject: [PATCH 1/2] Fix #162, Reference the generic OSAL BSP. 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. --- fsw/mcp750-vxworks/make/build_options.cmake | 15 +++++++++++++++ fsw/pc-linux/make/build_options.cmake | 2 ++ 2 files changed, 17 insertions(+) diff --git a/fsw/mcp750-vxworks/make/build_options.cmake b/fsw/mcp750-vxworks/make/build_options.cmake index 2fb12313..13046c12 100644 --- 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 index 809d7441..3988672e 100644 --- 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") + From 9c731523f9e3b095d7d667059803a9b9476144c8 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 9 Jun 2020 23:15:33 -0400 Subject: [PATCH 2/2] Increase version to 1.4.13 and update ReadMe --- README.md | 5 +++++ fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 2 +- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 850b317f..c3dc9f74 100644 --- 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 + ### 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 index 034ed04f..aa48b206 100644 --- 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/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index 034ed04f..aa48b206 100644 --- 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-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 034ed04f..aa48b206 100644 --- 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_ */