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 #338, Update RTEMS CMake Platform File #339

Merged
merged 1 commit into from May 19, 2022
Merged

Fix #338, Update RTEMS CMake Platform File #339

merged 1 commit into from May 19, 2022

Conversation

ghost
Copy link

@ghost ghost commented May 6, 2022

Please Note: This PR depends on cFE PR 2017: nasa/cFE#2097

Checklist (Please check before submitting)

Describe the contribution
Updates the RTEMS.cmake platform file to account for:

  • Differences in RTEMS 4.11, 5.1, 6.x, and the Gaisler provided RCC toolchain
  • Building the cFE core as a standalone executable or a dynamically loaded module

Testing performed
I built pc-rtems for RTEMS 4.11 and 5 and ran them both on the CI containers.
This was with: nasa/cFE#2097 applied

Expected behavior changes
No impact on behavior to existing pc-rtems builds.

System(s) tested on
Tested on RTEMS 4.11 and RTEMS 5 CI systems. (pc-rtems)

Additional context
This enables upcoming RTEMS changes documented here:
nasa/cFS#468

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

@ghost ghost added dependency CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels May 6, 2022
@chillfig chillfig removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label May 11, 2022
@astrogeco astrogeco added CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels May 11, 2022
@astrogeco astrogeco changed the title Fix 338 Update RTEMS Cmake platform file to support RTEMS 6, RCC, and… Fix #338, Update RTEMS Cmake platform file to support RTEMS 6, RCC, and… May 11, 2022
@astrogeco astrogeco added the CCB:Approved Indicates Approval by CCB label May 11, 2022
@astrogeco astrogeco requested a review from jphickey May 11, 2022 16:04
@astrogeco
Copy link
Contributor

CCB:2022-05-11, APPROVED

@astrogeco
Copy link
Contributor

@acudmore can you amend the commit to match the standard? Might also help to shorten the first line.

Updated the RTEMS.cmake platform file to support RTEMS 6, Gaisler RCC, and dynamically loaded cFE Core
@ghost
Copy link
Author

ghost commented May 18, 2022

@astrogeco , I changed the commit message to match the standard, shortened the first line, and added a second more descriptive line.

@astrogeco astrogeco changed the title Fix #338, Update RTEMS Cmake platform file to support RTEMS 6, RCC, and… Fix #338, Update RTEMS CMake Platform File May 18, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request May 18, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request May 18, 2022
nasa/PSP#339, Update RTEMS CMake Platform File
astrogeco added a commit to nasa/cFS that referenced this pull request May 18, 2022
Combines

nasa/cFE#2098, v7.0.0-rc4+dev127
nasa/osal#1251, v6.0.0-rc4+dev74
nasa/PSP#343, v1.6.0-rc4+dev34

**cFE**

nasa/cFE#2078, Adds truncation warning suppression flags

nasa/cFE#2094, Doc deploy from local workflow on main-branch push

nasa/cFE#2088, Add support for fractional seconds in epoch

nasa/cFE#2044, Remove redundant word in App Developers Guide

nasa/cFE#2099,  UT updates for alternate time configuration

**RTEMS 6 Support

nasa/cFE#2097, update rtems toolchain files

nasa/osal#1250, add os-impl-no-select.c for RTEMS

nasa/PSP#339, Update RTEMS CMake Platform File

**PSP**

nasa/PSP#341, Add cpu affinity example

**Fix Broken CodeQL Workflow Reference**

nasa/PSP#337

nasa/osal#1249

nasa/sample_lib#82

nasa/sample_app#173

nasa/sch_lab#113

nasa/ci_lab#109

nasa/to_lab#120

nasa/elf2cfetbl#110

nasa/tblCRCTool#68

nasa/cFS-GroundSystem#214

Co-authored-by: Justin Figueroa <[email protected]>
Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Jonathan Branderburg <[email protected]>
Co-authored-by: Alan Cudmore <[email protected]>
Co-authored-by: Hugo Valente <[email protected]>
astrogeco added a commit to nasa/cFS that referenced this pull request May 18, 2022
Combines

nasa/cFE#2098, v7.0.0-rc4+dev127
nasa/osal#1251, v6.0.0-rc4+dev74
nasa/PSP#343, v1.6.0-rc4+dev34

**cFE**

nasa/cFE#2078, Adds truncation warning suppression flags

nasa/cFE#2094, Doc deploy from local workflow on main-branch push

nasa/cFE#2088, Add support for fractional seconds in epoch

nasa/cFE#2044, Remove redundant word in App Developers Guide

nasa/cFE#2099,  UT updates for alternate time configuration

**RTEMS 6 Support

nasa/cFE#2097, update rtems toolchain files

nasa/osal#1250, add os-impl-no-select.c for RTEMS

nasa/PSP#339, Update RTEMS CMake Platform File

**PSP**

nasa/PSP#341, Add cpu affinity example

**Fix Broken CodeQL Workflow Reference**

nasa/PSP#337

nasa/osal#1249

nasa/sample_lib#82

nasa/sample_app#173

nasa/sch_lab#113

nasa/ci_lab#109

nasa/to_lab#120

nasa/elf2cfetbl#110

nasa/tblCRCTool#68

nasa/cFS-GroundSystem#214

Co-authored-by: Justin Figueroa <[email protected]>
Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Jonathan Branderburg <[email protected]>
Co-authored-by: Alan Cudmore <[email protected]>
Co-authored-by: Hugo Valente <[email protected]>
@astrogeco astrogeco merged commit 669af61 into nasa:main May 19, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2022
Combines

nasa/cFE#2098, v7.0.0-rc4+dev127
nasa/osal#1251, v6.0.0-rc4+dev74
nasa/PSP#343, v1.6.0-rc4+dev34

**cFE**

nasa/cFE#2078, Adds truncation warning suppression flags

nasa/cFE#2094, Doc deploy from local workflow on main-branch push

nasa/cFE#2088, Add support for fractional seconds in epoch

nasa/cFE#2044, Remove redundant word in App Developers Guide

nasa/cFE#2099,  UT updates for alternate time configuration

**RTEMS 6 Support

nasa/cFE#2097, update rtems toolchain files

nasa/osal#1250, add os-impl-no-select.c for RTEMS

nasa/PSP#339, Update RTEMS CMake Platform File

**PSP**

nasa/PSP#341, Add cpu affinity example

**Fix Broken CodeQL Workflow Reference**

nasa/PSP#337

nasa/osal#1249

nasa/sample_lib#82

nasa/sample_app#173

nasa/sch_lab#113

nasa/ci_lab#109

nasa/to_lab#120

nasa/elf2cfetbl#110

nasa/tblCRCTool#68

nasa/cFS-GroundSystem#214

Co-authored-by: Justin Figueroa <[email protected]>
Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Jonathan Branderburg <[email protected]>
Co-authored-by: Alan Cudmore <[email protected]>
Co-authored-by: Hugo Valente <[email protected]>
@dmknutsen dmknutsen added this to the Draco milestone Jan 18, 2023
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 dependency
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support RTEMS 6, Gaisler RCC, and Dynamically loaded cFE build in RTEMS.cmake platform file
4 participants