Fix #2096 update rtems toolchain files · Pull Request #2097 · nasa/cFE

ghost · 2022-04-27T13:22:39Z

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution

Fix Update RTEMS toolchain files for RTEMS 4.11, 5, and 6 #2096

Modifies the existing RTEMS 4.11 and RTEMS 5 toolchain files to:

Change the OS define to avoid using a reserved identifier (RTEMS(x)_)
Change the RTEMS 4.11 define to indicate it is deprecated
Add a BSP_SPECS_FLAGS flag to allow for RTEMS version variations in the specs flags
Add a dynamic load Cmake variable to allow for two types of CMAKE executable types in the platform file

Added a RTEMS 6 i686 toolchain file

Testing performed

Rebuilt and ran RTEMS 4.11 and RTEMS 5 tests
Tested RTEMS 6 build and ran tests (using local OSAL mods and CI docker image with RTEMS 6)

Expected behavior changes

No impact or behavior changes on RTEMS 4.11 and RTEMS 5

System(s) tested on

RTEMS 4.11, RTEMS 5 Docker images used in CI workflows

Additional context

The changes in the toolchain files for RTEMS 4.11 and RTEMS 5 are to accommodate the RTEMS 6 port and allow for additional RTEMS builds to use the same CMake Platform file for RTEMS.

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

astrogeco · 2022-04-27T16:15:43Z

CCB:2022-04-27

Edit commits to follow standard
Does this have dependencies in other repos?
Consider a consolidating into a common #include and add the differences
Should end up moving to always building as a dynamic module
- @jphickey check if we have an open issue

ghost · 2022-04-28T21:42:43Z

Addressing the CCB comments:
Edit commits to follow standard:
I left the # off of the 2nd commit message. Is that the problem with the commit?
Dependencies on other repos?
No - this does not depend on any other commits that I am making
Consider consolidating into a common CMake include for RTEMS toolchain files:
I took a look at this and there are only a handful of common lines in the files. I re-arranged the toolchain files in my latest commit so the common statements are at the bottom. Please let me know if you think it's worth factoring out those statements and I can make another commit. If not, these should work - I have built RTEMS 4.11, 5, and 6

astrogeco · 2022-05-04T14:46:38Z

Just a nit, an you amend the commit to switch uppercase "FIX" to regular "Fix"?

astrogeco · 2022-05-04T16:17:00Z

CCB:2022-05-04, APPROVED with CHANGES

ghost · 2022-05-04T16:45:36Z

CCB suggestion:
Remove: OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE from toolchain files, because these are now setup in the PSP.

Question:
A couple of PSPs have the following line in the build_options.cmake file:
set(CFE_PSP_EXPECTED_OSAL_BSPTYPE "generic-vxworks")
But the pc-rtems file does not. Is this needed before removing the OSAL_SYSTEM_BSPTYPE in the toolchain file?
(Edit: I removed the OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE and the CFE_PSP_EXPECTED_OSAL_BSPTYPE did not seem to be required)

…S 6 file

ghost · 2022-05-04T20:33:10Z

I removed OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE as they are not needed any more.
Rebased/Squashed to 1 commit.
Tested build of i686-rtems5 (built and ran bundle then all CI tests)
Tested build of i686-rtems4.11 (built and ran bundle then all CI tests)

I believe this is ready to merge

…n-files Fix #2096 update rtems toolchain files

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 · 2022-05-19T03:57:16Z

Merged in 41cadde

ghost requested a review from jphickey April 27, 2022 13:25

ghost marked this pull request as ready for review May 4, 2022 15:15

ghost added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label May 4, 2022

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 May 4, 2022

Fix #2096 update RTEMS Toolchain files, refactor, reorg, and add RTEM…

ab139dc

…S 6 file

ghost mentioned this pull request May 6, 2022

Fix #338, Update RTEMS CMake Platform File nasa/PSP#339

Merged

2 tasks

astrogeco changed the title ~~Fix 2096 update rtems toolchain files~~ Fix #2096 update rtems toolchain files May 12, 2022

astrogeco mentioned this pull request May 17, 2022

cFE Integration candidate: Caelum-rc4_dev9 #2098

Merged

2 tasks

astrogeco added a commit that referenced this pull request May 17, 2022

Merge pull request #2097 from acudmore:fix-2096-update-rtems-toolchai…

41cadde

…n-files Fix #2096 update rtems toolchain files

astrogeco mentioned this pull request May 18, 2022

cFS Integration candidate: Caelum-rc4+dev9 nasa/cFS#471

Merged

2 tasks

astrogeco closed this May 19, 2022

skliper added this to the Draco milestone Jul 19, 2022

skliper added the draco-rc2 label Jul 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #2096 update rtems toolchain files#2097

Fix #2096 update rtems toolchain files#2097
ghost wants to merge 1 commit intomainfrom
unknown repository

ghost commented Apr 27, 2022 •

edited by astrogeco

Loading

Uh oh!

astrogeco commented Apr 27, 2022 •

edited

Loading

Uh oh!

ghost commented Apr 28, 2022 •

edited by ghost

Loading

Uh oh!

astrogeco commented May 4, 2022 •

edited

Loading

Uh oh!

astrogeco commented May 4, 2022 •

edited

Loading

Uh oh!

ghost commented May 4, 2022 •

edited by ghost

Loading

Uh oh!

ghost commented May 4, 2022

Uh oh!

astrogeco commented May 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ghost commented Apr 27, 2022 • edited by astrogeco Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

astrogeco commented Apr 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Apr 28, 2022 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

astrogeco commented May 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

astrogeco commented May 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented May 4, 2022 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented May 4, 2022

Uh oh!

astrogeco commented May 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ghost commented Apr 27, 2022 •

edited by astrogeco

Loading

astrogeco commented Apr 27, 2022 •

edited

Loading

ghost commented Apr 28, 2022 •

edited by ghost

Loading

astrogeco commented May 4, 2022 •

edited

Loading

astrogeco commented May 4, 2022 •

edited

Loading

ghost commented May 4, 2022 •

edited by ghost

Loading