-
Notifications
You must be signed in to change notification settings - Fork 57
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.
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
Fix #121, Unify CFE PSP with OSAL BSP #149
Fix #121, Unify CFE PSP with OSAL BSP #149
Conversation
Note - this pull request depends on the OSAL BSP changes associated with nasa/osal#261 in pull request nasa/osal#404. It should be merged at the same cycle that pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Love it.
CCB 20200408 - APPROVED |
Integration Candidate 2020-04-01
I checked out nasa/osal#404 along with this branch and build failed for SIMULATION=native, ENABLE_UNIT_TESTS=true...
|
See also https://travis-ci.com/github/skliper/cFS/jobs/318899041, shows failure with the two branches. Is there another pull that needs to be included? @jphickey |
Did you also include nasa/cFE#585? This needs to be merged together with the others. Looking at the CFE, I'm not seeing this merged into the integration-candidate yet. Note that the CFE merge can happen before the OSAL/PSP ones (it will have no effect) but it cannot happen after. |
That worked. Would help to have the version information covering what was tested in the pull request, it's not clear what was tested here. |
18/56 Test #18: coverage-shared-filesys ..........***Failed 0.01 sec Using nasa/cFE#585, #149, nasa/osal#404 with the bundle |
4 failures in the test... fixing them now. Related to nasa/osal#387 EDIT - added link to pull that caused them |
Instead of redefining the basic entry point symbols, use the OSAL BSP and its abstractions. The CFE PSP just becomes an extension to the OSAL BSP, and only needs to define the OS_Application_Startup symbol like any other OSAL application.
36c6974
to
ab6aa2a
Compare
Rebased on master so it can be tested with the bundle |
Describe the contribution
Instead of redefining the basic entry point symbols, use the OSAL BSP and its abstractions. The CFE PSP just becomes an extension to the OSAL BSP, and only needs to define the OS_Application_Startup symbol like any other OSAL application.
Fixes #121
Testing performed
Build code for all supported targets (ppc-vxworks6.9, i686-rtems4.11, native/x86-64 linux). Verify clean build. Confirm CFE boots and responds to commands as normal for RTEMS and native linux targets.
Expected behavior changes
No behavior changes. Code structure/linking change only.
System(s) tested on
Ubuntu 18.04 LTS 64 bit (native, build host)
QEMU for RTEMS 4.11
Additional context
VxWorks testing pending on availability of test platform
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.