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

Integration Candidate: 2020-05-27 #167

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Integration Candidate: 2020-05-27 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f55e3ca
Fix #162, Reference the generic OSAL BSP.
jphickey May 14, 2020
6e0c7a5
Merge pull request #164 from jphickey/fix-162-generic-bsp
astrogeco Jun 2, 2020
9c73152
Increase version to 1.4.13 and update ReadMe
Jun 10, 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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
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: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
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")

2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */