Skip to content

khadas-edge2: remove legacy uboot#9367

Merged
Grippy98 merged 1 commit into
armbian:mainfrom
efectn-forks:edge2-remove-vendor-uboot
Feb 7, 2026
Merged

khadas-edge2: remove legacy uboot#9367
Grippy98 merged 1 commit into
armbian:mainfrom
efectn-forks:edge2-remove-vendor-uboot

Conversation

@efectn

@efectn efectn commented Feb 6, 2026

Copy link
Copy Markdown
Member

Description

Remove Khadas Edge 2 vendor uboot support as it is broken on recent builds and mainline uboot also has similar functionalities including kbi command with patch.

GitHub issue reference:
Jira reference number [AR-9999]

Documentation summary for feature / change

Please delete this section if entry to main documentation is not needed.

If documentation entry is predicted, please provide key elements for further implementation into main documentation and set label to "Needs Documentation". You are welcome to open a PR to documentation or you can leave following information for technical writer:

  • short description (copy / paste of PR title)
  • summary (description relevant for end users)
  • example of usage (how to see this in function)

How Has This Been Tested?

  • Tested SD boot
  • Tested eMMC boot

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • Chores
    • Simplified Khadas Edge2 bootloader configuration to consistently use mainline U-Boot settings, removing conditional boot mechanisms and streamlining the boot setup process.

@github-actions github-actions Bot added 02 Milestone: First quarter release size/small PR with less then 50 lines labels Feb 6, 2026
@coderabbitai

coderabbitai Bot commented Feb 6, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The pull request removes a branch-specific U-Boot setup function from the Khadas Edge2 board configuration and consolidates its logic into a mainline U-Boot override function, eliminating branch-based conditionals and simplifying the boot configuration flow.

Changes

Cohort / File(s) Summary
U-Boot Configuration Consolidation
config/boards/khadas-edge2.conf
Removed post_family_config__uboot_kedge2() function that conditionally gated factory-style U-Boot setup; streamlined post_family_config__kedge2_use_mainline_uboot() to unconditionally apply mainline U-Boot overrides with boot-related parameters (BOOTCONFIG, BOOTDELAY, BOOTSOURCE, BOOTBRANCH, BOOTPATCHDIR, BOOTDIR, UBOOT_TARGET_MAP).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

🐰 Simplify, simplify, the rabbit does say,
Remove the old branches that clutter the way,
Mainline U-Boot flows, so clean and so bright,
Khadas Edge2 boots true, configuration made right!

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically summarizes the main change: removing legacy U-Boot support for the Khadas Edge2 board.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions Bot added Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Feb 6, 2026
@github-actions github-actions Bot added the Ready to merge Reviewed, tested and ready for merge label Feb 6, 2026
@github-actions

github-actions Bot commented Feb 6, 2026

Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions Bot removed the Needs review Seeking for review label Feb 6, 2026
@Grippy98 Grippy98 merged commit 114bbfc into armbian:main Feb 7, 2026
13 checks passed
yury-deltsov pushed a commit to yury-deltsov/build that referenced this pull request Feb 8, 2026
Agreed during maintainer meeting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines

Development

Successfully merging this pull request may close these issues.

3 participants