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 #162, reference generic OSAL BSP #164

Merged
merged 2 commits into from
Jun 2, 2020

Conversation

jphickey
Copy link
Contributor

Describe the contribution
The change in nasa/osal#449 makes the BSP modules more generic and changes the name. This changes the PSP reference to be compatible.

Testing performed
Build for all platforms and sanity check CFE operation

Expected behavior changes
No change to behavior.

System(s) tested on
Ubuntu 20.04 (native)
RTEMS 4.11 on pc686 / QEMU
VxWorks 6.9 on MCP750

Additional context
Makes build compatible with nasa/osal#449

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

@jphickey
Copy link
Contributor Author

Note, initially created as draft due to baseline differences. Other code needs to be merged first and then this will need to be rebased.

@skliper skliper added CCB-20200520 enhancement New feature or request labels May 20, 2020
@astrogeco
Copy link
Contributor

CCB 20200520 - APPROVED

@astrogeco astrogeco added the CCB:Approved Indicates Approval by CCB label May 26, 2020
@astrogeco
Copy link
Contributor

@jphickey should I remove the draft status from this and merge?

@astrogeco astrogeco changed the base branch from master to integration-candidate May 27, 2020 14:12
@jphickey
Copy link
Contributor Author

@jphickey should I remove the draft status from this and merge?

Hold off on this one until next cycle - will rebase....
But the PR #163 should be merged if possible (its a dependency)

astrogeco and others added 2 commits May 29, 2020 18:47
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.
@jphickey jphickey changed the base branch from integration-candidate to master June 1, 2020 18:37
@jphickey jphickey marked this pull request as ready for review June 1, 2020 18:37
@jphickey
Copy link
Contributor Author

jphickey commented Jun 1, 2020

Rebased, should be good to go now.

@skliper
Copy link
Contributor

skliper commented Jun 2, 2020

@astrogeco This is the PSP side for the OSAL change... project priority.

@astrogeco astrogeco changed the base branch from master to integration-candidate June 2, 2020 15:38
@astrogeco astrogeco merged commit 6e0c7a5 into nasa:integration-candidate Jun 2, 2020
@astrogeco astrogeco linked an issue Jun 10, 2020 that may be closed by this pull request
@jphickey jphickey deleted the fix-162-generic-bsp branch June 16, 2020 17:39
@skliper skliper added this to the 1.5.0 milestone Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates Approval by CCB enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reference the generic OSAL BSPs
3 participants