u-boot: v2026.04 (final) fixes and bumps for some boards#9654
Merged
igorpecovnik merged 13 commits intoarmbian:mainfrom Apr 13, 2026
Merged
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (19)
💤 Files with no reviewable changes (1)
✅ Files skipped from review due to trivial changes (2)
🚧 Files skipped from review as they are similar to previous changes (3)
📝 WalkthroughWalkthroughThis PR updates multiple board U-Boot references to final v2026.04 tags, removes an ODROID N2 MMC frequency patch, replaces compile-time warnings with runtime log_info() instrumentation in FDT fixups, and tweaks USB/LWIP config enables for several boards. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
github-actions
bot
added
05
rpardini
requested review from
HeyMeco,
NicoD-SBC,
amazingfate and
catalinii
as code owners
github-actions
bot
added
Hardware
rpardini
requested review from
ColorfulRhino,
SuperKali,
Tonymac32,
igorpecovnik,
pyavitz and
schwar3kat
as code owners
Collaborator
|
Will check with Rock-4D and Mekotronics R58S2 and report back |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch (2)
131-131:⚠️ Potential issue | 🟡 MinorRemove compile-time
#warningdirective from image-fdt.c instrumentation.The patch adds a build warning at line 131 that should be removed before merging:
-#warning "Building image-fdt.c: fdt fixup call chain instrumented for MAC debugging."🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch` at line 131, Remove the temporary compile-time warning added to instrument the fdt fixup chain by deleting the preprocessor directive `#warning` "Building image-fdt.c: fdt fixup call chain instrumented for MAC debugging." from image-fdt.c; ensure no other instrumentation-only diagnostics remain and run a build to confirm no stray `#warning` directives are present (target symbol: the `#warning` directive in image-fdt.c).
28-29:⚠️ Potential issue | 🔴 CriticalFix
nodeoffredeclaration infdt_fixup_ethernet.Line 28 declares
int nodeoffunder#ifdef FDT_SEQ_MACADDR_FROM_ENV(ending at line 81), and line 92 redeclaresint nodeoffunconditionally in the same function scope. This causes a compile error whenFDT_SEQ_MACADDR_FROM_ENVis enabled.🔧 Minimal fix
- int nodeoff = fdt_path_offset(fdt, path); - if (nodeoff < 0) { + int nodeoff_path = fdt_path_offset(fdt, path); + if (nodeoff_path < 0) { log_info("[fdt_fixup_ethernet] Node path '%s' not found, skipping\n", path); total_skipped++; continue; } - const struct fdt_property *status_prop = fdt_get_property(fdt, nodeoff, "status", NULL); + const struct fdt_property *status_prop = fdt_get_property(fdt, nodeoff_path, "status", NULL); if (status_prop && strcmp((const char *)status_prop->data, "okay")) { log_info("[fdt_fixup_ethernet] Node '%s' status is '%s', skipping\n", path, (const char *)status_prop->data); total_skipped++; continue; } - log_info("[fdt_fixup_ethernet] Patching node '%s' (offset %d) with MAC %02x:%02x:%02x:%02x:%02x:%02x\n", path, nodeoff, mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); + log_info("[fdt_fixup_ethernet] Patching node '%s' (offset %d) with MAC %02x:%02x:%02x:%02x:%02x:%02x\n", path, nodeoff_path, mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch` around lines 28 - 29, The function fdt_fixup_ethernet currently declares int nodeoff twice (once under `#ifdef` FDT_SEQ_MACADDR_FROM_ENV and again unconditionally), causing a redeclaration compile error; fix it by removing the second/duplicate declaration and reuse the existing nodeoff variable (or move a single declaration to function scope before the `#ifdef`) so only one int nodeoff exists in fdt_fixup_ethernet; update any references to nodeoff accordingly and ensure the surrounding logic that uses nodeoff and fdt_prop remains unchanged.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@patch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patch`:
- Line 131: Remove the temporary compile-time warning added to instrument the
fdt fixup chain by deleting the preprocessor directive `#warning` "Building
image-fdt.c: fdt fixup call chain instrumented for MAC debugging." from
image-fdt.c; ensure no other instrumentation-only diagnostics remain and run a
build to confirm no stray `#warning` directives are present (target symbol: the
`#warning` directive in image-fdt.c).
- Around line 28-29: The function fdt_fixup_ethernet currently declares int
nodeoff twice (once under `#ifdef` FDT_SEQ_MACADDR_FROM_ENV and again
unconditionally), causing a redeclaration compile error; fix it by removing the
second/duplicate declaration and reuse the existing nodeoff variable (or move a
single declaration to function scope before the `#ifdef`) so only one int nodeoff
exists in fdt_fixup_ethernet; update any references to nodeoff accordingly and
ensure the surrounding logic that uses nodeoff and fdt_prop remains unchanged.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: e8a4d3d5-c1c6-469e-ab66-7ac13893d326
📒 Files selected for processing (13)
config/boards/mekotronics-r58x-4g.cscconfig/boards/mekotronics-r58x-pro.cscconfig/boards/mixtile-blade3.cscconfig/boards/odroidn2.confpatch/u-boot/v2022.10/board_odroidn2/0001-mmc-meson_gx_mmc-limit-f_max-to-24-MHz.patchpatch/u-boot/v2026.04/1001-fdt_fixup_ethernet-add-logs.patchpatch/u-boot/v2026.04/board_radxa-rock-4d/v5-1-4-spl-Make-UFS-available-for-SPL-builds.patchpatch/u-boot/v2026.04/board_radxa-rock-4d/v5-2-4-reset-rockchip-make-device-resets-available-in-SPL.patchpatch/u-boot/v2026.04/board_radxa-rock-4d/v5-3-4-ufs-rockchip-Add-device-reset-support.patchpatch/u-boot/v2026.04/board_radxa-rock-4d/v5-4-4-rockchip-spl-Add-support-for-booting-from-UFS.patchpatch/u-boot/v2026.04/defconfig/mixtile-blade3-rk3588_defconfigpatch/u-boot/v2026.04/dt_uboot/rk3588-mixtile-blade3-u-boot.dtsipatch/u-boot/v2026.04/dt_upstream_rockchip/rk3588-mixtile-blade3.dts
💤 Files with no reviewable changes (1)
- patch/u-boot/v2022.10/board_odroidn2/0001-mmc-meson_gx_mmc-limit-f_max-to-24-MHz.patch
Collaborator
|
@coderabbitai make suggestions for the board configs of Rock-4D and Mekotronics-R58S2 to switch from the rc to final 2026.04 tag |
Contributor
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain🏁 Script executed: Length of output: 335 🏁 Script executed: Length of output: 7706
- declare -g BOOTBRANCH="tag:v2026.04-rc2"
+ declare -g BOOTBRANCH="tag:v2026.04"
- declare -g BOOTBRANCH="tag:v2026.04-rc2"
+ declare -g BOOTBRANCH="tag:v2026.04"🧠 Learnings used |
Collaborator
|
My local builds for both were fine @rpardini you can bump those with this PR too |
Member
Author
|
Nice. Will add bumps to all other 2026.04-rcX stuff as soon as I confirm they all build |
- remove left-behind 22.10 patch from previous bump
- just move defconfig/dt/dt_uboot around
- no changes intended, but keep other board's u-boot sources clean - Fixes: 77f919f
- those were added to ensure that code was actually being compiled - we're pretty sure now, so avoid spurious warnings during compilation Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
force-pushed
the
pr/u-boot-v202604-final-fixes-and-bumps-for-some-boards
branch
from
de27473 to
d5f2b60
Compare
Collaborator
|
btw the UFS patches are not board specific actually. Some NanoPi's also can utilise them to move off of vendor uboot (which is even more important since vendor uboot is quite broken on modern build hosts like ours). They’re also in master so nothing unconventional that would affect other boards either. They’re behind the UFS Rockchip config |
HeyMeco
approved these changes
Apr 12, 2026
Contributor
|
✅ This PR has been reviewed and approved — all set for merge! |
Member
Author
Sorry, patches were added in a board-related PR without real attribution. Maybe re-pick from mailing list? |
Contributor
|
Just a heads up — PR #9651 fixes a zstd decompression bug in U-Boot's BTRFS code (fs/btrfs/compression.c). The file is identical across v2025.10, v2026.01, and v2026.04. |
Collaborator
I think what I did was just to download the series and remove the mail headers. How would you do it? https://patchwork.ozlabs.org/project/uboot/patch/20260120-rk3576-ufs-v5-1-0edb61b301b7@gmail.com/ |
Member
|
This ready or we need to fix something? |
Member
Author
This bumps all boards with 2026.04-rcX to 2026.04 final, the ones I physically have have been tested, others Meco tested, others build fine. I'd say it's fine. I'll send separate PR moving from 2026.01 -> 2026.04 for the ones I own. |
Member
Author
This is not the same thread ID, just an example. This gives you a single patch with the whole series, with correct mbox headers and attribution. |
Collaborator
|
Thanks @rpardini. I knew I should start learning b4 at some point. This will be a good reason to give it a try |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
u-boot: v2026.04 (final) fixes and bumps for some boards
Summary by CodeRabbit
Release Notes
Updates
New Features
Bug Fixes
Improvements