Skip to content

orangepi5-plus: u-boot: restore vendor uboot with blobs#9287

Merged
igorpecovnik merged 1 commit intoarmbian:mainfrom
rpardini:pr/orangepi5-plus-u-boot-restore-vendor-uboot-with-blobs
Jan 23, 2026
Merged

orangepi5-plus: u-boot: restore vendor uboot with blobs#9287
igorpecovnik merged 1 commit intoarmbian:mainfrom
rpardini:pr/orangepi5-plus-u-boot-restore-vendor-uboot-with-blobs

Conversation

@rpardini
Copy link
Member

@rpardini rpardini commented Jan 23, 2026

  • 🌳 mainline AT-F only for non-vendor BRANCH
  • 🍀 vendor branch uses vendor u-boot with rkbin blobs
  • 🌱 sorry for the confusion; I overlooked the conditional here
  • 🌴 Fixes: f45765e

Summary by CodeRabbit

  • New Features

    • Added SPI boot support for Orange Pi 5 Plus.
  • Chores

    • Updated boot configuration for Orange Pi 5 Plus to improve compatibility and mainline U-Boot support.

✏️ Tip: You can customize this high-level summary in your review settings.

- mainline AT-F only for non-vendor BRANCH
- vendor branch uses vendor u-boot with rkbin blobs
- sorry for the confusion; I overlooked the conditional here
- Fixes: f45765e
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 23, 2026

📝 Walkthrough

Walkthrough

The Orange Pi 5 Plus board configuration is updated to enable SPI boot support and change the default boot scenario from "tpl-blob-atf-mainline" to "spl-blobs", while a post-configuration hook restores the mainline U-Boot boot scenario.

Changes

Cohort / File(s) Change Summary
Board Configuration
config/boards/orangepi5-plus.conf
Added SPI boot support flags (BOOT_SUPPORT_SPI, BOOT_SPI_RKSPI_LOADER). Changed default BOOT_SCENARIO from "tpl-blob-atf-mainline" to "spl-blobs". Extended post_family_config__orangepi5plus_use_mainline_uboot hook to override BOOT_SCENARIO back to "tpl-blob-atf-mainline" and re-invoke boot configuration preparation.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested reviewers

  • igorpecovnik
  • EvilOlaf
  • amazingfate
  • paolosabatino

Poem

🐰 A boot path springs forth, SPI support takes flight,
Default flows change, but mainline's restored right,
Configuration hops between two sacred ways,
The Orange Pi hares now boot with brighter days! 🥕⚡

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main change: restoring vendor u-boot with blobs for the orangepi5-plus board configuration.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

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


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 02 Milestone: First quarter release size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Jan 23, 2026
@rpardini rpardini marked this pull request as ready for review January 23, 2026 10:04
@github-actions github-actions bot added the Ready to merge Reviewed, tested and ready for merge label Jan 23, 2026
@github-actions
Copy link
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 Jan 23, 2026
@igorpecovnik igorpecovnik merged commit 4392af1 into armbian:main Jan 23, 2026
1 check passed
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.

2 participants