-
Notifications
You must be signed in to change notification settings - Fork 217
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 #1349 #1447, Break up pc-rtems to support generic configuration and add tarfs support #1350
Conversation
@dmknutsen, @alanc98, @jphickey - maybe a splinter discussion/demonstration at some point? This implementation works for me and if this is accepted as a path forward I could finish it up, submit the toolchain I'm using to cFE and whatever is needed in the PSP (note I'm using the current RTEMS.cmake). Wouldn't be hard to add the QEMU LEON3 build/testing to CI. Note it does still fail 4 tests in stand alone exe mode since I'm not setting up the nonvol file system yet and QEMU LEON3 doesn't have an eth device emulated. Other option could be to set up an internal run on one of the dev boards. Note this doesn't setup drivers to run on the dev board yet, but that shouldn't be much extra work since rki2 has it implemented. |
Note the applicable commit is 1503d51, the rest are just dependencies that make this easier and have their own PRs. |
1503d51
to
07bcea9
Compare
I tested this and it works. With and without the shell. I was able to run some of the unit tests as well. When running the cFS, it doesn't find the es startup script. We will need to fix this. Will probably get fixed when nonvol fs is set up. |
07bcea9
to
c602b49
Compare
c602b49
to
9797b0e
Compare
9797b0e
to
6945e5c
Compare
Note - discussed at 20230803 CCB, sounds like this is the right direction just need to separate so the PC specifics can be included in that case (source select). Would be good to also set up a workflow to test on leon3 w/ QEMU. Even better if we had nonvol set up! |
c3b8e26
to
d4df5e9
Compare
d4df5e9
to
0dbf17c
Compare
0dbf17c
to
21ceb0e
Compare
21ceb0e
to
136f94a
Compare
136f94a
to
c9f4e67
Compare
c9f4e67
to
19cdc0e
Compare
ba4804c
to
5e1e6ca
Compare
9dcc4e5
to
2d2eb50
Compare
Passed cFS level checks (including rtems 4.11 and 5). See https://github.com/nasa/cFS/pull/746/checks @pepepr08 Could you review? |
2d2eb50
to
bf7953e
Compare
Note this just supports tarfs from OSAL and doesn't actually add the two step build. Additional changes in work are needed in the PSP, see nasa/PSP#376. As a quick proof of concept I added the two step build from the prep step of an additional target, so user can build and install the main target, then create the tarfile and link/build as a separate follow on command (using the target config settings). Example:
|
CCB 29 Feb 2024: @jphickey will perform review and CCB will revisit next week. |
@skliper Can we rename to generic-rtems? |
Maybe better to rename it in a separate merge since the renaming might break projects that are using pc-rtems |
Renaming also requires updates to the sample_defs, so we would need to update the cfe repo as well. I submitted PRs with the name change to @skliper 's branches, so we can easily merge it if we want to include it. cFE PR for name change not created yet, but here is the commit: pepepr08/cFE@60286f3 |
All checks passing for all changes on this PR + my renamed generic-rtems osal: https://github.com/nasa/cFS/pull/749/checks |
bf7953e
to
342d7e3
Compare
9f3e7cd
to
0309e72
Compare
…ration and add tarfs support
0309e72
to
10dd0fe
Compare
Note this works w/ current workflows for rtems 5 and 4.11 (with the corresponding cFE update): |
*Combines:* cFE equuleus-rc1+dev120 osal equuleus-rc1+dev62 **Includes:** *cFE* - nasa/cFE#2535 - nasa/cFE#2539 *osal* - nasa/osal#1350 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
*Combines:* cFE equuleus-rc1+dev120 osal equuleus-rc1+dev62 **Includes:** *cFE* - nasa/cFE#2535 - nasa/cFE#2539 *osal* - nasa/osal#1350 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
*Combines:* cFE equuleus-rc1+dev120 osal equuleus-rc1+dev62 **Includes:** *cFE* - nasa/cFE#2535 - nasa/cFE#2539 *osal* - nasa/osal#1350 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
Checklist (Please check before submitting)
Describe the contribution
Splits up bsp_start.c so features can be optionally included: cmdline, shell, stand alone exe vs module
RTEMS configuration is now in bsp_init.c, included based on stand alone/module selection
Testing performed
Ran w/ LEON3 QEMU with/without shell and stand alone/module options.
Expected behavior changes
PC behavior shouldn't change based on default options matching previous behavior
Except for the file system and command line, the rest is usable by LEON3
System(s) tested on
LEON3 QEMU modified as documented by RCC:
RCC-1.3.1
For running as a module I based it on https://github.com/alanc98/rki2, although there are mods...
Additional context
See notes in comments below for latest information
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC