Skip to content

Changing hw/latest to track patch_v1.1 branch in RTL repo #1811

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[submodule "hw/latest/rtl"]
path = hw/latest/rtl
url = https://github.com/chipsalliance/caliptra-rtl
branch = main
branch = patch_v1.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

lgtm, but I think you may need to commit the branch change so that git knows which commit the submodule is at.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can you elaborate on that? The branch does exist in the RTL repo. But I may be misunderstanding something about the submodule behavior here.

Copy link
Contributor

Choose a reason for hiding this comment

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

The submodule in main points to 5f85fb4, which is patch_v1.1. Jordan if I'm understanding your comment right then the submodule is already updated.

[submodule "hw/1.0/rtl"]
path = hw/1.0/rtl
url = https://github.com/chipsalliance/caliptra-rtl
Expand Down
Loading