Skip to content

Conversation

@EvilOlaf
Copy link
Member

Description

  • bump uboot to v2025.10
  • remove vendor condition since it is not an actual kernel target, therefore never comes into play

How Has This Been Tested?

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

@github-actions github-actions bot added size/small PR with less then 50 lines 11 Milestone: Fourth quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Oct 22, 2025
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 22, 2025

Walkthrough

The change modifies the nanopi-r3s-lts board configuration by removing a branch-specific guard condition in the post_family_config__use_mainline_uboot() function that previously restricted mainline U-Boot usage to "current" and "edge" branches. Additionally, the mainline U-Boot version is updated from v2025.04 to v2025.10 in both tag and version references.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

The change is localized to a single configuration file with straightforward modifications: removal of a conditional guard and version number updates. The logic change is clear and the overall scope is limited, requiring verification that the guard removal is intentional and the version bump is consistent.

Possibly related PRs

  • radxa-zero3 maintenance #8794: Modifies the same post_family_config__use_mainline_uboot() logic to allow mainline U-Boot for non-vendor branches and updates mainline U-Boot version to v2025.10
  • rock-3a board config maintenance #8795: Changes the same board-family post_family_config logic by removing branch-guard conditions and bumps mainline U-Boot version from v2025.04 to v2025.10
  • opi5plus - board config maintenance #8787: Applies the same code-level change pattern of consolidating branch-specific handlers and bumping mainline U-Boot to v2025.10

Suggested labels

Ready to merge

Suggested reviewers

  • igorpecovnik
  • amazingfate
  • catalinii
  • pyavitz
  • rpardini

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Title Check ✅ Passed The pull request title "nanopi-r3s-lts: board config and uboot maintenance" is partially related to the changeset. It correctly identifies the board and indicates work involving board configuration and U-Boot, which aligns with the two main changes: bumping U-Boot from v2025.04 to v2025.10 and removing the vendor condition from the post_family_config__use_mainline_uboot() function. However, the title uses the term "maintenance" which is somewhat generic and doesn't specifically convey the concrete primary changes (version bump and removal of the guard condition).
Description Check ✅ Passed The pull request description is directly related to the changeset. It clearly outlines the two main changes: bumping U-Boot to v2025.10 and removing the vendor condition with an explanation of why (it is not an actual kernel target). The description also documents the testing performed including building U-Boot, booting an edge image, and testing the armbian-install process, which demonstrates thoroughness and relates to the impact of the changes.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 189bcaf and 17bafeb.

⛔ Files ignored due to path filters (1)
  • patch/u-boot/v2025.10/board_nanopi-r3s-lts/Add-board-NanoPi-R3S-LTS.patch is excluded by !patch/**
📒 Files selected for processing (1)
  • config/boards/nanopi-r3s-lts.conf (1 hunks)
🧰 Additional context used
🧠 Learnings (2)
📓 Common learnings
Learnt from: rpardini
PR: armbian/build#8044
File: patch/u-boot/v2025.04/cmd-fileenv-read-string-from-file-into-env.patch:76-86
Timestamp: 2025-03-31T22:20:48.475Z
Learning: For the Armbian build project, maintaining consistency with existing patches across U-Boot versions (such as between 2025.01 and 2025.04) is prioritized over refactoring individual patches for code improvements.
📚 Learning: 2025-09-12T19:28:38.491Z
Learnt from: Grippy98
PR: armbian/build#8622
File: config/sources/families/k3.conf:66-66
Timestamp: 2025-09-12T19:28:38.491Z
Learning: In the Armbian k3 family build system (config/sources/families/k3.conf), builds do not fail when TIBOOT3_BOOTCONFIG is unset, even though tiboot3.bin is still listed in UBOOT_TARGET_MAP. The gating mechanism in pre_config_uboot_target__build_first_stage function works as intended to conditionally build/copy tiboot3.bin only when TIBOOT3_BOOTCONFIG is defined.

Applied to files:

  • config/boards/nanopi-r3s-lts.conf
🔇 Additional comments (2)
config/boards/nanopi-r3s-lts.conf (2)

13-13: LGTM: Redundant guard logic removed.

The removal of the branch guard condition is correct. Since KERNEL_TARGET="current,edge" (line 6) already constrains which branches can be built for this board, the guard checking for "vendor" branch was indeed redundant and never applicable.


17-18: Version bump verified—all prerequisites are in place.

Both the U-Boot tag v2025.10 and the patch directory patch/u-boot/v2025.10 exist and are properly configured. The version bump from v2025.04 to v2025.10 has the necessary patches (including board-specific patches for nanopi-r3s-lts) and aligns with the testing described in the PR.


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.

@coderabbitai coderabbitai bot requested a review from igorpecovnik October 22, 2025 17:31
@github-actions github-actions bot added the Ready to merge Reviewed, tested and ready for merge label Oct 22, 2025
@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 Oct 22, 2025
@igorpecovnik igorpecovnik merged commit 8597096 into armbian:main Oct 22, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to 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