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

Opensbi #633

Merged
merged 1 commit into from
Jul 22, 2020
Merged

Opensbi #633

merged 1 commit into from
Jul 22, 2020

Conversation

NathanTP
Copy link
Contributor

Type of change: new feature

Impact: software change

Release Notes
Adds OpenSBI support to the software infrastructure (FireMarshal and Qemu). OpenSBI is now the default for all Marshal-managed workloads.

@NathanTP NathanTP requested a review from a0u July 20, 2020 20:54
@NathanTP
Copy link
Contributor Author

This shows libgloss as changed, but none of the commits seem to list it and I certainly never changed it. Not sure what that is all about (some quirk of git with merging dev?).

@a0u
Copy link
Member

a0u commented Jul 21, 2020

This shows libgloss as changed, but none of the commits seem to list it and I certainly never changed it. Not sure what that is all about (some quirk of git with merging dev?).

Hmm, this situation illustrates why repeated back-merges can lose changes if the merge strategy isn't carefully chosen.
The PR branch actually points to ucb-bar/libgloss-htif@a88e50f (an old commit), whereas dev points to ucb-bar/libgloss-htif@04b2497.

If there are no objections, I'll rebase and squash the QEMU and FireMarshal bumps into one cleaner commit. From my experience, it wasn't necessary to bump riscv-isa-sim for OpenSBI, but that is probably harmless.

@NathanTP
Copy link
Contributor Author

go for it, I really don't understand what happened considering this PR never touched it. Whatever.

Copy link
Member

@a0u a0u left a comment

Choose a reason for hiding this comment

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

The commit-on-master-check failure is due to the FireMarshal submodule not pointing to the master branch. Perhaps check-commit.sh should be amended to permit dev.

@jerryz123
Copy link
Contributor

IT should be sufficient to replace branches=("master") with

if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
then
    branches=("master")
else
    branches=("master" "dev")
fi

@NathanTP NathanTP merged commit 29c924d into dev Jul 22, 2020
@NathanTP NathanTP deleted the opensbi branch July 22, 2020 17:00
@alonamid alonamid mentioned this pull request Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants