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 #914, Add toolchain file for RTEMS 5.1/pc-rtems #1031

Merged
merged 1 commit into from Dec 9, 2020
Merged

Fix #914, Add toolchain file for RTEMS 5.1/pc-rtems #1031

merged 1 commit into from Dec 9, 2020

Conversation

ghost
Copy link

@ghost ghost commented Nov 25, 2020

Describe the contribution
Fix #914
This change makes a minor comment change to the rtems 4.11 i686 toolchain file to remove a reference to CEXP.
The change also adds an RTEMS 5.1 i686 toolchain file.

Testing performed
After building the RTEMS 4.11 and RTEMS 5.1 tools and BSPs for the i686, I was able to build the cFS bundle using:
make SIMULATION=i686-rtems-4.11 prep
make install

and

make SIMULATION=i686-rtems-5 prep
make install

and I was able to run the bundle on x86 QEMU according to the instructions in the PSP README.txt file:
https://github.com/nasa/PSP/blob/main/fsw/pc-rtems/README.txt
Note, that PSP ticket 197 and PR 220 have updates to the README.txt files.
Also, this depends on a PR for OSAL (TBD) for issue 608)

Expected behavior changes

  • Or no impact to behavior

System(s) tested on

  • Hardware: QEMU x86
  • OS: RTEMS
  • Versions: RTEMS 4.11 and RTEMS 5.1

Additional context
Requires a fix for OSAL, which is described in OSAL ticket 608. PR will be submitted. But the comment change does not affect current RTEMS 4.11 build.

Third party code
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Alan Cudmore NASA/GSFC Code 582.0

@ghost ghost added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Nov 30, 2020
@astrogeco astrogeco added CCB-20201202 dependency and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Dec 2, 2020
@astrogeco
Copy link
Contributor

CCB 20201202 - APPROVED

  • Still maintains support for 4.11

Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I can help with doing a source selection if necessary.

@astrogeco astrogeco changed the base branch from main to integration-candidate December 7, 2020 14:53
@astrogeco astrogeco changed the title Fix #914 - Add toolchain file for RTEMS 5.1/pc-rtems Fix #914, Add toolchain file for RTEMS 5.1/pc-rtems Dec 7, 2020
@astrogeco astrogeco linked an issue Dec 7, 2020 that may be closed by this pull request
@astrogeco astrogeco merged commit 1a2b636 into nasa:integration-candidate Dec 9, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 9, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Dec 9, 2020
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for RTEMS 5.1 - sample_defs toolchain file updates
3 participants