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.

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 #532, Link CFE core with OSAL BSP #533

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Link the CFE core target with the OSAL BSP library by including this in the final link library list.

Fixes #532

Testing performed
Build and run unit tests on native (x86-64) and PC-RTEMS. Confirm CFE runs normally, no change.

Expected behavior changes
No behavior changes. This change only enables future transition to using the OSAL BSP rather than
duplicating startup logic in the CFE PSP. Initially the linker should drop/ignore the content of this library.

System(s) tested on

  • Ubuntu 18.04 LTS, 64 bit (native)
  • PC-RTEMS using i686-rtems4.11 cross build

Additional context
This depends on the related change in nasa/osal#261 which defines the separate osal_bsp target. It should be merged at the same time (or after) the OSAL change is merged.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Enables future transition to using the OSAL BSP rather than
duplicating startup logic in the CFE PSP.
@astrogeco astrogeco added CCB:Ready Ready for discussion at the Configuration Control Board (CCB) CCB - 20200325 labels Mar 20, 2020
@astrogeco
Copy link
Contributor

CCB 2020-03-25: Approved

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Mar 25, 2020
@jphickey
Copy link
Contributor Author

Please hold off on merging this one for now, it has a relationship to nasa/osal#261 and on second look it might be easier to handle it via target_link_libraries on OSAL.

@astrogeco astrogeco changed the base branch from master to integration-candidate April 1, 2020 04:30
@astrogeco astrogeco changed the title Link CFE core with OSAL BSP Fix #532, Link CFE core with OSAL BSP Apr 1, 2020
@astrogeco astrogeco merged commit 82e3e02 into nasa:integration-candidate Apr 1, 2020
@astrogeco
Copy link
Contributor

astrogeco commented Apr 1, 2020

Please hold off on merging this one for now, it has a relationship to nasa/osal#261 and on second look it might be easier to handle it via target_link_libraries on OSAL.

I merged it into the IC but I won't merge IC into master. I see that the nasa/osal#261 doesn't have an attached PR yet. Does it make sense to delay this fix if the new solution doesn't exist yet? @skliper thoughts?

@skliper
Copy link
Contributor

skliper commented Apr 1, 2020

I'd back it out of the IC branch if @jphickey doesn't think this is the way to go, or at least hold off on merge until confirmed.

@astrogeco
Copy link
Contributor

I'd back it out of the IC branch if @jphickey doesn't think this is the way to go, or at least hold off on merge until confirmed.

I'll bring it up at CCB

@astrogeco
Copy link
Contributor

CCB 2020-04-01 @jphickey working on alternate implementation. Remove from integration-candidate

@jphickey jphickey deleted the fix-532-link-osal-bsp branch April 2, 2020 16:02
@skliper skliper added the invalid label Apr 2, 2020
astrogeco pushed a commit to nasa/cFS that referenced this pull request Apr 3, 2020
Rejecting nasa/cFE#533 which was merged into cFE's integration candidate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB invalid
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CFE core build should link with the OSAL BSP library
3 participants