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

Rebase on edk2-stable202108 #34

Merged
merged 0 commits into from
Dec 21, 2021
Merged

Rebase on edk2-stable202108 #34

merged 0 commits into from
Dec 21, 2021

Conversation

crawfxrd
Copy link
Member

@crawfxrd crawfxrd commented Oct 23, 2021

Update from edk2-stable202002 to edk2-stable202108.

  • Rebases our changes on the new tag
  • Cherry-picks most commits in order from @MrChromebox upp_test to reduce the difference in the series
  • Cherry-picks most commits in order from @9elements 9elements_rebase for new features
    • SMMSTOREv2-based EFI variable storage, TPM support, Secure Boot support
  • Applies our commits on top
    • Drops upstreamed commits
    • Modified commits to fix building
    • Squashes several commits that were fixes

TODO:

  • Drop commit that enabled EC logging
  • Fix using gop-policy
  • Fix using firmware-setup
  • firmware-smmstore
    • UEFI app not needed anymore; not picked
  • Skip PCI validation, or change NVIDIA driver in coreboot to not override where resources are allocated

@crawfxrd crawfxrd mentioned this pull request Oct 23, 2021
28 tasks
@crawfxrd crawfxrd force-pushed the rebase-stable202108 branch from 6943bcc to 55dbe64 Compare October 26, 2021 03:26
@crawfxrd crawfxrd marked this pull request as ready for review October 27, 2021 03:35
@crawfxrd crawfxrd force-pushed the rebase-stable202108 branch from 1bcf97b to 3edf75a Compare November 3, 2021 01:24
@crawfxrd crawfxrd force-pushed the rebase-stable202108 branch from 3edf75a to bbc0497 Compare November 12, 2021 00:49
@crawfxrd crawfxrd requested review from jackpot51 and a team November 19, 2021 18:06
@13r0ck
Copy link

13r0ck commented Nov 19, 2021

Good luck with those conflicts 🙏
You are super hero

@crawfxrd
Copy link
Member Author

It's going to be force pushed, so conflicts don't matter.

Current branch is preserved as system76-stable202002.

@crawfxrd crawfxrd merged commit a618e43 into system76 Dec 21, 2021
@crawfxrd crawfxrd deleted the rebase-stable202108 branch December 21, 2021 20:01
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.

2 participants