cm3588-nas: u-boot: bump to v2026.07-rc3 - #9975
#9975cm3588-nas: u-boot: bump to v2026.07-rc3#9975igorpecovnik merged 3 commits intoarmbian:mainarmbian/build:mainfrom rpardini:pr/cm3588-nas-u-boot-bump-to-v202607-rc3rpardini/armbian-build:pr/cm3588-nas-u-boot-bump-to-v202607-rc3Copy head branch name to clipboard
Conversation
📝 WalkthroughWalkthroughThe CM3588-NAS board config is bumped to U-Boot v2026.07-rc4 with branch-dependent BL31 selection (rkbin blob for vendor branch, mainline ChangesCM3588-NAS board config and U-Boot v2026.07 patches
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 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 |
There was a problem hiding this comment.
Actionable comments posted: 4
🧹 Nitpick comments (1)
patch/u-boot/v2026.07/cmd-fileenv-read-string-from-file-into-env.patch (1)
57-57: 💤 Low valueConsider using a local variable instead of static global.
fs_argvdoesn't need to persist across calls and could be a local array insidedo_fileenv(). This avoids unnecessary static state.Proposed change
-static char *fs_argv[5]; - int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { + char *fs_argv[5]; + if (argc < 6) return CMD_RET_USAGE;🤖 Prompt for 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. In `@patch/u-boot/v2026.07/cmd-fileenv-read-string-from-file-into-env.patch` at line 57, The variable `fs_argv` is currently declared as a static global array that persists across function calls, but since it does not need to retain its value between invocations, convert it to a local variable. Move the declaration `static char *fs_argv[5];` from the global scope into the `do_fileenv()` function (removing the static keyword), placing it near the beginning of the function before it is first used. Update all references to `fs_argv` within `do_fileenv()` to work with the local variable.
🤖 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 `@patch/u-boot/v2026.07/1001-fdt_fixup_ethernet-add-logs.patch`:
- Around line 130-131: The patch file 1001-fdt_fixup_ethernet-add-logs.patch has
an unintended blank line being added before the SPDX-License-Identifier header
at the start of the file. Remove the blank line that appears before the SPDX
header so that the SPDX-License-Identifier comment becomes the first line of the
file, as required by license-scanning tools.
- Around line 92-103: The variable nodeoff is being redeclared at line 92 which
shadows the existing nodeoff variable declared at function scope (line 70 when
FDT_SEQ_MACADDR_FROM_ENV is defined), causing a redundant fdt_path_offset call.
Remove the variable declaration at line 92 and reuse the existing nodeoff
variable instead, assigning the result of fdt_path_offset directly to it.
Additionally, review the status check logic at lines 98-103: the current
condition strcmp((const char *)status_prop->data, "okay") only allows nodes with
status="okay" or no status property, but the previous behavior would patch any
node that is not "disabled". Determine whether this stricter check is
intentional for backward compatibility or if it should be changed to skip only
"disabled" nodes.
In `@patch/u-boot/v2026.07/cmd-fileenv-read-string-from-file-into-env.patch`:
- Around line 25-29: The CMD_FILEENV Kconfig configuration block is missing a
dependency declaration on CMD_FAT. Since the implementation relies on
do_fat_fsload() which is only available when CMD_FAT is enabled, add a
dependency statement within the config CMD_FILEENV block to declare the required
dependency on CMD_FAT. This will prevent link-time failures when enabling
CMD_FILEENV without FAT support.
- Around line 79-86: The sanitization loop exits immediately when it encounters
a non-printable character because it sets *s = 0x00 (null-terminating the
string) without advancing the pointer, causing the while condition to become
false on the next iteration. This truncates the string at the first
non-printable character rather than removing it. To fix this, either: (1) add a
comment to clarify that truncation at first non-printable is intentional
behavior, or (2) if the intent is to strip non-printables while preserving
subsequent content, use a two-pointer approach where you write printable
characters to a destination pointer while reading from source pointer s,
allowing the loop to continue processing the entire string and compact it by
removing non-printables.
---
Nitpick comments:
In `@patch/u-boot/v2026.07/cmd-fileenv-read-string-from-file-into-env.patch`:
- Line 57: The variable `fs_argv` is currently declared as a static global array
that persists across function calls, but since it does not need to retain its
value between invocations, convert it to a local variable. Move the declaration
`static char *fs_argv[5];` from the global scope into the `do_fileenv()`
function (removing the static keyword), placing it near the beginning of the
function before it is first used. Update all references to `fs_argv` within
`do_fileenv()` to work with the local variable.
🪄 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: 87a53645-e2ad-4ffb-8ca6-26ac9041271f
📒 Files selected for processing (5)
config/boards/cm3588-nas.cscpatch/u-boot/v2026.07/0000.patching_config.yamlpatch/u-boot/v2026.07/1001-fdt_fixup_ethernet-add-logs.patchpatch/u-boot/v2026.07/cmd-fileenv-read-string-from-file-into-env.patchpatch/u-boot/v2026.07/general-rk3588-add-i2s-mclk-output-to-io-clock-ids.patch
|
✅ This PR has been reviewed and approved — all set for merge! |
|
Yep, hdmi-rx on vendor requires the vendor BL31/ATF/TF-A blob. There's an interrupt remap, see https://lore.kernel.org/linux-rockchip/20251210160006.528997-1-dmitry.osipenko@collabora.com/ |
|
Ah okay that’s what I thought might be it. Haven’t considered the hybrid approach you used here but my thought process on my maintained boards was that if you know how to utilise HDMI RX you can also build your own u-boot but I think I'm going to adapt this too |
|
It does make it work -- but it creates the situation "what the hell TF-A/u-boot do I have on this eMMC/SPI/etc?" which is quite confusing. Specially for boards with say SPI, and people might be switching between vendor and mainline. |
cm3588-nas: u-boot: bump to v2026.07-rc3
Summary by CodeRabbit
Release Notes
New Features
fileenvcommand to read files from FAT filesystem into environment variables.Chores