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

hwmv2: Added Board Support for Starfive VisionFive2 RISC-V Single Board Computer #69808

Merged
merged 0 commits into from
Mar 5, 2024

Conversation

pfarwsi
Copy link
Contributor

@pfarwsi pfarwsi commented Mar 5, 2024

These list of patches contain Board support files for running Zephyr on the Starfive VisionFive2 RISC-V Single Board Computer based on JH7110 SOC. It's a basic support, no drivers other than UART have been tested.

@kanakshilledar
Copy link
Contributor

This is the rebased version of #69676. As per the maintainers requirements to rebase the PR. We created a new PR which points from main to main.

@ycsin
Copy link
Member

ycsin commented Mar 5, 2024

cc @cfriedt Milk-V Mars

@ycsin
Copy link
Member

ycsin commented Mar 5, 2024

We created a new PR which points from main to main.

I think what @nordicjm meant in #69676 is to rebase the changes on top of zephyr/main, the original PR probably merged zephyr/main into pfarwsi:collab-hwm, which led to the 973 commits.

The general practice is to create a branch from main and do your changes there, then create a PR pointing that PR branch to zephyr/main, the reason is that at some point you might have more than one PR.

Taking this PR as an example, I'd create a branch named pr/add_starfive_visionfive2 from main.

@pfarwsi
Copy link
Contributor Author

pfarwsi commented Mar 5, 2024

@ycsin Agreed! Thanks for the insight, we will take care of that from next time : )

Copy link
Member

@ycsin ycsin left a comment

Choose a reason for hiding this comment

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

Haven't go thru everything yet, but please have a look at #64161 and plan the commits properly, i.e. you should be adding dts bindings first, then soc, drivers and finally boards

Please don't create another PR, so that things are easier to trace. You should do your changes in the current branch, rewrite the git history and force push them to github


Just in case you didn't already know - rebasing is pretty easy if you are using vscode:

  1. checkout your PR branch (in this case - pfarwsi:main)
  2. fetch upstream main branch
  3. right click zephyr:main branch and select Rebase Current Branch onto Branch
  4. ctrl + shift + p: Git: Push (force)

@aescolar aescolar merged commit dc68b11 into zephyrproject-rtos:main Mar 5, 2024
5 of 24 checks passed
Copy link

github-actions bot commented Mar 5, 2024

Hi @pfarwsi!
Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a fantastic achievement, and we're thrilled to have you as part of our community!

To celebrate this milestone and showcase your contribution, we'd love to award you the Zephyr Technical Contributor badge. If you're interested, please claim your badge by filling out this form: Claim Your Zephyr Badge.

Thank you for your valuable input, and we look forward to seeing more of your contributions in the future! 🪁

@kanakshilledar
Copy link
Contributor

@aescolar @ycsin we just started doing rewrite in the git history and the PR got merged. What shall we do now?

@ycsin
Copy link
Member

ycsin commented Mar 5, 2024

@aescolar @ycsin we just started doing rewrite in the git history and the PR got merged. What shall we do now?

that's awkward - I'm not sure if pushing commits to the main branch would reopen the PR, otherwise it looks somewhat like a GitHub bug to me and you might have to recreate a new PR, maybe with a name other than main this time

@aescolar
Copy link
Member

aescolar commented Mar 5, 2024

@kanakshilledar it seems like the problem may be that you have created this PR from your own forks main branch, and your forks main branch has been updated to match Zephyr's main a couple of minutes ago? (effectively making this PR a no-op)
I'd recommend you restart the PR using a different branch in your fork than main so as to avoid possible mishaps.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Process area: RISCV RISCV Architecture (32-bit & 64-bit)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants