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.

Sign up for GitHub

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

Jump to bottom

vm_minimal: add zcu102 support #46

Merged
merged 1 commit into from
Jan 24, 2024
Merged

vm_minimal: add zcu102 support #46

merged 1 commit into from
Jan 24, 2024

Conversation

chrisguikema
Copy link
Contributor

@chrisguikema chrisguikema commented Sep 7, 2023 •
edited
Loading

@chrisguikema chrisguikema force-pushed the zynqmp_support branch 4 times, most recently from 4e0348a to 4b0d4d5 Compare September 13, 2023 15:00
@chrisguikema chrisguikema force-pushed the zynqmp_support branch 2 times, most recently from d6dc43b to 98fa9c5 Compare September 21, 2023 17:16
@axel-h axel-h mentioned this pull request Sep 27, 2023
Merged
@axel-h
Copy link
Member

axel-h commented Sep 27, 2023 •
edited
Loading

Changed "Test with:" form seL4/camkes-vm#111 to .../112

Since seL4/util_libs#169 and seL4/seL4#1102 have been closed, these should be removed also?

@chrisguikema
Copy link
Contributor Author

Yes. I removed the two closed PRs from the "Test with" list.

@axel-h axel-h mentioned this pull request Sep 27, 2023
Merged
@chrisguikema
Copy link
Contributor Author

Can this get reviewed?

@axel-h
Copy link
Member

axel-h commented Oct 11, 2023

In general, the changes look ok to me. However, I can't test this in detail.

@chrisguikema chrisguikema force-pushed the zynqmp_support branch 2 times, most recently from e83b90e to 7fc7d7a Compare January 19, 2024 20:36
@chrisguikema chrisguikema force-pushed the zynqmp_support branch 3 times, most recently from adda808 to 53900a5 Compare January 19, 2024 21:38
@chrisguikema
Copy link
Contributor Author

@axel-h Can you review this PR now that the files have been merged into camkes-vm-images? I believe this is the last piece before the ZCU102 is fully supported in mainline.

axel-h
axel-h approved these changes Jan 23, 2024
View reviewed changes
Copy link
Member

@axel-h axel-h left a comment

Choose a reason for hiding this comment

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

Looks good to me

@chrisguikema
Copy link
Contributor Author

@abrandnewusername can this be merged after the camkes-vm PR so the ZCU102 can be officially supported upstream?

lsf37
lsf37 approved these changes Jan 23, 2024
View reviewed changes
Copy link
Member

@lsf37 lsf37 left a comment

Choose a reason for hiding this comment

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

Looks good from my side. Can you please also add the zcu102 to the list in the README?

@chrisguikema
Copy link
Contributor Author

Absolutely!

@chrisguikema
Copy link
Contributor Author

One sec - Testing locally and there's a problem with the DTB generation. I'll fix it quick

@chrisguikema
Copy link
Contributor Author

Alright, there were two problems:

  1. A dts is not a dtb :)
  2. The kernel device tree still uses the amba bus, while the 2021.1 device tree specifies the axi bus

But this works locally now, so it should be good to merge once I fixup the CI failure.

@chrisguikema
vm_minimal: add zcu102 support
fa60480 
Signed-off-by: Chris Guikema <[email protected]>
@lsf37
Copy link
Member

lsf37 commented Jan 24, 2024

Ok, happy to merge this now, and then we'll see if we can switch on CI for it.

@lsf37 lsf37 merged commit 926def0 into seL4:master Jan 24, 2024
10 checks passed
@axel-h axel-h mentioned this pull request Jan 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lsf37 lsf37 lsf37 approved these changes

@axel-h axel-h axel-h approved these changes

@kent-mcleod kent-mcleod Awaiting requested review from kent-mcleod

@abrandnewusername abrandnewusername Awaiting requested review from abrandnewusername

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chrisguikema @axel-h @lsf37