Rock-5B-Plus and Rock-5T: Move to u-boot 2026.04

[HeyMeco]

Description

For Armbian 2026.05 move Rock-5B-Plus and Rock-5T (both platinum level) to entirely upstream u-boot. This makes patching redundant therefore I removed the old patches too.

How Has This Been Tested?

• Rock 5B-Plus with Armbian_26.2.5_Rock-5b-plus_resolute_vendor_6.1.115_minimal.img
• Rock-5T with Armbian_26.2.5_Rock-5t_resolute_current_6.18.24_minimal.img

The SPI was flashed manually with the 2026.04 u-boot and the emmc was flashed with the images mentioned above downloaded from the armbian website.

Checklist:

• 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
  • Needs RK3588: Add v1.20 DDR blob rkbin#43

Summary by CodeRabbit

• New Features

  • Added support for Rock 5T board.
  • Expanded Rock 5B/5B+ hardware support: Rock 5B+ device tree, USB‑C/SBU, additional HDMI/audio paths, extra video decoders, RNG, and enhanced PCIe/IOMMU wiring.
  • Better board selection for Rock 5B variants and handling of memory-specific DT selection.

• Chores

  • Updated mainline U‑Boot and DDR blob targets to newer releases.

[coderabbitai]

📝 Walkthrough

Walkthrough

This PR updates and extends Armbian's U-Boot support for the Radxa Rock 5 board family, including mainline U-Boot version bumps for Rock 5B Plus to v2026.04, complete addition of Rock 5T board support with device trees and U-Boot configuration, and implementation of runtime memory-type detection for Rock 5B Plus to differentiate LPDDR5 and LPDDR4 variants.

Changes

Rock 5 Board Family Support

Layer / File(s)	Summary
Device Tree Base Infrastructure patch/u-boot/v2025.04/board_rock-5t/0000-Prior-Upstream-DT-hacks.patch	Removes OP-TEE firmware node from RK3588 base DT; adds HDMI audio (hdmi0_sound), video decoders (vdec0, vdec1), RNG, renamed/extended HDMI PHYs, expanded PCIe/IOMMU wiring, new power domains, and regulator definitions.
Rock 5T Device Tree Definitions patch/u-boot/v2025.04/board_rock-5t/0001-Add-Rock5T-dt-modifications.patch, patch/u-boot/v2025.04/board_rock-5t/0002-Add-Rock5T-dts-to-upstream-dir.patch	Introduces new upstream DTSI (rk3588-rock-5b-5bp-5t.dtsi) shared across 5-series boards; adds Rock 5T-specific DTS with USB-C/SBU nodes, audio, LEDs, and rfkill; replaces local Rock 5B DTS content with upstream includes.
Rock 5T U-Boot Board Support patch/u-boot/v2025.04/board_rock-5t/0003-Add-Rock5T-support.patch	Adds Rock 5T board path, Kconfig symbol TARGET_ROCK5T_RK3588, defconfig, public header, MAINTAINERS entry, and U-Boot DT integration for ROCK5T.
Rock 5B Plus Memory Detection & DTB Selection patch/u-boot/v2025.10/board_rock-5b-plus/0002-Add-ROCK-5BPlus-support.patch	Implements runtime memory-type detection via PMUGRF registers; adds board_fit_config_name_match() and rk_board_late_init() to select appropriate DTB (rock-5b-plus for LPDDR5, rock-5b for LPDDR4) and set fdtfile environment variable.
Rock 5B Plus Configuration patch/u-boot/v2025.10/board_rock-5b-plus/0001-Set-NET_PREFER_ROM_MAC_ADDR.patch	Enables CONFIG_NET_PREFER_ROM_MAC_ADDR in Rock 5B Plus defconfig.
Mainline U-Boot Boot Configuration config/boards/rock-5b-plus.conf, config/boards/rock-5t.conf	Updates BOOTBRANCH and BOOTPATCHDIR to v2026.04 for Rock 5B Plus; configures Rock 5T mainline boot with tpl-blob-atf-mainline scenario and rock5b-rk3588_defconfig; adjusts UBOOT_TARGET_MAP BL31 mapping to bl31.elf.
DDR blob default config/sources/families/include/rockchip64_common.inc	Updates default rk3588 DDR_BLOB from v1.18 to v1.20_20250926.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~50 minutes

Possibly related PRs

• armbian/build#8918: Updates the same mainline U-Boot hooks for Rock 5B Plus and Rock 5T board configurations with boot branch/patch version changes.

Suggested labels

11

Suggested reviewers

• rpardini
• igorpecovnik
• TheSnowfield
• SuperKali
• efectn
• NicoD-SBC

🐰 I hopped through DTS and patchy rows,
New T and Plus decide which memory grows.
Branches bumped, blobs and DTBs in line,
U‑Boot set up — ready to shine!
🥕

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately summarizes the main changes: updating Rock-5B-Plus and Rock-5T boards to U-Boot 2026.04, which is the primary objective evident throughout all file modifications.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
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 unit tests (beta)

• Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

• Generate code and open pull requests
• Plan features and break down work
• Investigate incidents and troubleshoot customer tickets together
• Automate recurring tasks and respond to alerts with triggers
• Summarize progress and report instantly

Built for teams:

• Shared memory across your entire org—no repeating context
• Per-thread sandboxes to safely plan and execute work
• Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@config/boards/rock-5t.conf`:
- Around line 35-45: The boot config uses BOOT_SCENARIO="tpl-blob-atf-mainline"
with prepare_boot_configuration (which sets ATF_COMPILE=yes and builds mainline
bl31.elf) but UBOOT_TARGET_MAP still maps BL31 to the proprietary blob via
BL31=${RKBIN_DIR}/${BL31_BLOB}, so the compiled ATF is discarded; fix by either
setting ATF_COMPILE=no immediately after prepare_boot_configuration to skip
mainline ATF, or update UBOOT_TARGET_MAP to use BL31=bl31.elf (matching
rock-5b-plus.conf) so the built bl31.elf is embedded; reference BOOT_SCENARIO,
prepare_boot_configuration, ATF_COMPILE, UBOOT_TARGET_MAP, BL31 and BL31_BLOB
when making the change.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 6ccf2be4-4bd6-4d06-9299-5f096dd7129d

📥 Commits

Reviewing files that changed from the base of the PR and between 7d91e37 and c299214.

📒 Files selected for processing (8)

• config/boards/rock-5b-plus.conf
• config/boards/rock-5t.conf
• patch/u-boot/v2025.04/board_rock-5t/0000-Prior-Upstream-DT-hacks.patch
• patch/u-boot/v2025.04/board_rock-5t/0001-Add-Rock5T-dt-modifications.patch
• patch/u-boot/v2025.04/board_rock-5t/0002-Add-Rock5T-dts-to-upstream-dir.patch
• patch/u-boot/v2025.04/board_rock-5t/0003-Add-Rock5T-support.patch
• patch/u-boot/v2025.10/board_rock-5b-plus/0001-Set-NET_PREFER_ROM_MAC_ADDR.patch
• patch/u-boot/v2025.10/board_rock-5b-plus/0002-Add-ROCK-5BPlus-support.patch

💤 Files with no reviewable changes (6)

• patch/u-boot/v2025.04/board_rock-5t/0002-Add-Rock5T-dts-to-upstream-dir.patch
• patch/u-boot/v2025.10/board_rock-5b-plus/0001-Set-NET_PREFER_ROM_MAC_ADDR.patch
• patch/u-boot/v2025.10/board_rock-5b-plus/0002-Add-ROCK-5BPlus-support.patch
• patch/u-boot/v2025.04/board_rock-5t/0003-Add-Rock5T-support.patch
• patch/u-boot/v2025.04/board_rock-5t/0000-Prior-Upstream-DT-hacks.patch
• patch/u-boot/v2025.04/board_rock-5t/0001-Add-Rock5T-dt-modifications.patch

[HeyMeco]

@coderabbitai review again

[coderabbitai]

Tip

For best results, initiate chat on the files or code changes.

@HeyMeco Sure, I'll re-review the changes right away!

[review]

[github-actions]

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

[HeyMeco]

Going to retest with the new DDR blob and then merge. All platinum based RK3588 boards should also be retested after the DDR binary change