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

grub-with-dtb: accept GRUB_FDT_FILE if BOOT_FDT_FILE is unset #7972

Merged
merged 1 commit into from
Mar 19, 2025
Merged

grub-with-dtb: accept GRUB_FDT_FILE if BOOT_FDT_FILE is unset #7972

merged 1 commit into from
Mar 19, 2025

Conversation

rpardini
Copy link
Member

  • some boards have u-boot auto-detect the board variant, and thus we unset BOOT_FDT_FILE
  • but grub needs to know...
  • so introduce a GRUB_FDT_FILE that is checked in case BOOT_FDT_FILE is not set
  • this way we can keep u-boot autodetecting and grub happy
  • preserve BOOT_FDT_FILE into GRUB_FDT_FILE for nanopct6/nanopct6-lts

@rpardini
grub-with-dtb: accept GRUB_FDT_FILE if BOOT_FDT_FILE is unset
a6b9ab0 
- some boards have u-boot auto-detect the board variant, and thus we unset `BOOT_FDT_FILE`
- but grub needs to know...
- so introduce a `GRUB_FDT_FILE` that is checked in case `BOOT_FDT_FILE` is not set
- this way we can keep u-boot autodetecting and grub happy
- preserve BOOT_FDT_FILE into GRUB_FDT_FILE for `nanopct6`/`nanopct6-lts`
@github-actions github-actions bot added size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Framework Framework components labels Mar 19, 2025
@rpardini
Copy link
Member Author

read: I broke T6's edk2 support last time, lets fix it
because: https://github.com/edk2-porting/edk2-rk3588/releases/tag/v1.0

@rpardini rpardini marked this pull request as ready for review March 19, 2025 02:03
@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 05 Milestone: Second quarter release and removed Needs review Seeking for review labels Mar 19, 2025
@igorpecovnik igorpecovnik merged commit 15cc3d3 into armbian:main Mar 19, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igorpecovnik igorpecovnik igorpecovnik approved these changes

@SuperKali SuperKali Awaiting requested review from SuperKali SuperKali is a code owner

@Tonymac32 Tonymac32 Awaiting requested review from Tonymac32 Tonymac32 is a code owner

Assignees
No one assigned
Labels
05 Milestone: Second quarter release Framework Framework components Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rpardini @igorpecovnik