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

VCS #677

Closed
wants to merge 149 commits into from
Closed

VCS #677

wants to merge 149 commits into from

Conversation

Divya2030
Copy link
Contributor

No description provided.

Thomas-J-Kidd and others added 30 commits January 4, 2024 22:00
Merge branch 'main' of github.com:Thomas-J-Kidd/cvw
…ain' of github.com:Thomas-J-Kidd/cvw
Merge branch 'main' of github.com:Thomas-J-Kidd/cvw
davidharrishmc and others added 20 commits March 12, 2024 09:49
fix elements forgot to delete from zknh32.sv
separates setup.sh into setup.sh and site-setup.sh.  site-setup.sh is to be copied into $RISCV/site-setup.sh by the system admin and modified as needed.
setup.sh should no longer require modifications for individual systems.
Increase number of jobs in riscof to speedup building.
Adding argparser to nightly_build.py in addition to minor updates
fcvtmod.w.d fix and config-shared.vh updates
Add derived configs directory to wally.do so derived configs can be simulated
@davidharrishmc
Copy link
Contributor

Divya, this PR has more than 100 commits to 94 files. I don't think you are trying to change all these files. It looks like they are an artifact of a merge that you have done.

Could you cancel this PR and reissue it with just the changes you are intending to make?

You may need to do a "git pull upstream main" to update your clone of your fork, and then apply the changes you intend, and then commit those changes. Let me know if you have any problems.

@davidharrishmc
Copy link
Contributor

Also, it's good to make the PR into the main branch of CVW instead of a vis branch, as long as you've tested you won't break anything. You may have to close this PR and reissue to the main branch.

@rosethompson
Copy link
Contributor

This is my fault i created the vcs branch as I didn't want to merge in that temporary file with the empty module. We should synth this branch. I'll make a pull request and then the diff will look more reasonable.

@rosethompson
Copy link
Contributor

Ok I made the fast forward pull request. This should reduce the number of diffs in this pull request. If we are happy with your changes. Lets go ahead and merge into the main branch.

@davidharrishmc
Copy link
Contributor

Now there's a conflict, and I think we need to change the target to the main branch.

@rosethompson
Copy link
Contributor

rosethompson commented Mar 24, 2024

The only thing I see missing the copy right and authorship on the two script files. Can you add these? You can base this off of any of the system verilog files?

@rosethompson
Copy link
Contributor

And yes I now agree with David we should just change the target to the main branch.

@Divya2030 Divya2030 closed this Mar 31, 2024
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.

7 participants