radxa-zero3: Allow "current" builds, with wifi #7992
Conversation
WalkthroughThis pull request introduces changes to both an installation script and a board configuration file. In the installation script, the previous kernel version check against a specific version (6.12) has been removed and replaced with conditions that verify if header installation requirements are met and if the 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
size/medium
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
config/boards/radxa-zero-3w.csc(1 hunks)extensions/radxa-aic8800.sh(1 hunks)
🔇 Additional comments (4)
extensions/radxa-aic8800.sh (1)
13-16: Improved error handling and diagnostic messagingThe updated code simplifies the early return logic and adds a more descriptive warning when
AIC8800_TYPEis not set. This change aligns with the PR objective to improve debugging when AIC8800_TYPE is missing.The removal of the kernel version check (which previously limited compatibility to kernels before 6.12) is appropriate since the upstream AIC8800 driver now supports kernels up to version 6.13 as mentioned in the PR description.
config/boards/radxa-zero-3w.csc (3)
1-16: LGTM: Board configuration properly definedThe new board configuration file for Radxa ZERO 3W defines all the necessary parameters including the board name, family, bootloader configuration, and kernel targets. The
AIC8800_TYPEis correctly set to "sdio" and the radxa-aic8800 extension is enabled as required.
17-21: LGTM: Mainline DTB handling is appropriateThis function correctly configures the board for mainline U-Boot usage by unsetting the BOOT_FDT_FILE to allow U-Boot to auto-detect the device tree file, and removes the BOOTFS_TYPE limitation since mainline U-Boot can boot directly from ext4.
22-35: LGTM: Vendor U-Boot configuration is well-definedThe vendor U-Boot configuration correctly specifies the Radxa repository and branch, with appropriate target mapping and write function. The function also properly cleans up any existing function definitions to avoid conflicts.
config/boards/radxa-zero-3w.csc
Outdated
| function post_family_config_branch_edge__radxa-zero3_use_mainline_uboot() { | ||
| BOOTCONFIG="radxa-zero-3-rk3566_defconfig" | ||
| BOOTSOURCE="https://github.com/u-boot/u-boot" | ||
| BOOTBRANCH="tag:v2024.10" | ||
| BOOTPATCHDIR="v2024.10" | ||
|
|
||
| UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin" | ||
|
|
||
| unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd | ||
|
|
||
| function write_uboot_platform() { | ||
| dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none | ||
| } | ||
| } |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
Verify U-Boot tag version freshness
The mainline U-Boot configuration specifies tag v2024.10, which appears to be a future release based on current U-Boot versioning patterns (as of 2023, latest was around v2023.xx).
🌐 Web query:
What is the latest stable release version of U-Boot?
💡 Result:
The latest stable release of U-Boot is v2025.01, which was officially released on January 6, 2025 [1][5][10]. This version follows U-Boot's quarterly release cycle, with updates focused on hardware support, bug fixes, and feature enhancements.
Here are key details about upcoming releases and development:
- The next scheduled release is v2025.04, planned for April 7, 2025 [1][5].
- The merge window for v2025.04 closed on January 27, 2025, and four release candidates (rc1-rc4) have already been published between January and March 2025 [1][5].
- Subsequent releases are tentatively scheduled for July 7, 2025 (v2025.07) and October 6, 2025 (v2025.10) [5].
Developers should note that U-Boot uses a year.month versioning scheme (e.g., 2025.01 = January 2025 release). The project maintains a strict merge window period (21 days post-release) for new features, followed by a stabilization phase with release candidates [1][3][5]. For device-specific implementations like BeagleBone or Turris boards, vendor-maintained forks might use older versions (e.g., 2022.04) depending on hardware compatibility [6][7][9].
Citations:
- 1: https://github.com/u-boot/u-boot/blob/master/doc/develop/release_cycle.rst
- 2: https://forum.pine64.org/showthread.php?tid=19238
- 3: https://docs.u-boot.org/en/latest/develop/version.html
- 4: http://forum.rvspace.org/t/confusion-about-latest-spl-u-boot-binaries/3589
- 5: https://docs.u-boot.org/en/latest/develop/release_cycle.html
- 6: https://forum.beagleboard.org/t/updating-to-2022-u-boot/31598
- 7: https://forum.beagleboard.org/t/what-is-the-latest-stable-u-boot-version-for-beagle-bone-black/39517
- 8: https://github.com/u-boot/u-boot
- 9: https://forum.turris.cz/t/is-it-safe-to-upgrade-u-boot/20212
- 10: https://readthedocs.org/projects/u-boot/
- 11: https://github.com/u-boot/u-boot/releases
- 12: https://tracker.debian.org/u-boot
Action: Update U-Boot tag version for freshness
The configuration in config/boards/radxa-zero-3w.csc currently sets:
BOOTBRANCH="tag:v2024.10"BOOTPATCHDIR="v2024.10"
Given that the latest stable U-Boot release is now v2025.01 (released January 6, 2025), please verify whether using the older version is intentional due to compatibility or stabilization reasons. If there's no specific dependency on v2024.10, update these settings to reflect the latest stable release to take advantage of improved hardware support, bug fixes, and features.
There was a problem hiding this comment.
Check for improvements for rk3568 or the board itself that would justify a version bump.
There was a problem hiding this comment.
🧩 Analysis chain
@EvilOlaf After researching changes between U-Boot v2024.10 and v2025.01, I found no significant improvements specifically for RK3566/RK3568 platforms or Radxa boards that would justify a version bump. The current v2024.10 configuration appears to be appropriate for the Radxa Zero 3W board.
Unless there are specific requirements for features added in v2025.01, maintaining the current version is reasonable for stability. The defined configuration looks well-aligned with the board's needs.
🏁 Script executed:
#!/bin/bash
# Clone U-Boot repository
git clone --depth=1 https://github.com/u-boot/u-boot.git
cd u-boot
# Fetch the tags we need
git fetch --depth=1 origin tag v2024.10
git fetch --depth=1 origin tag v2025.01
# Check for changes related to Rockchip RK3566/RK3568 between the two versions
echo "=== Changes related to RK3566/RK3568 between v2024.10 and v2025.01 ==="
git log v2024.10..v2025.01 --oneline --grep="rk35" --grep="rk356" --grep="rockchip.*356"
echo -e "\n=== Changes related to Radxa boards between v2024.10 and v2025.01 ==="
git log v2024.10..v2025.01 --oneline --grep="radxa"
echo -e "\n=== General Rockchip platform changes between v2024.10 and v2025.01 ==="
git log v2024.10..v2025.01 --oneline --grep="rockchip" | head -n 20
# Look at the release notes for v2025.01
echo -e "\n=== v2025.01 Release Highlights ==="
if [ -f doc/releases/u-boot-2025.01.rst ]; then
cat doc/releases/u-boot-2025.01.rst | grep -A 50 "Highlights"
else
echo "Release notes not found in expected location"
# Try to find them elsewhere
find . -name "*2025.01*.rst" -o -name "CHANGELOG*" | xargs grep -l "2025.01" | xargs cat | grep -A 50 "Highlights" || echo "No release notes found"
fi
Length of output: 3660
🏁 Script executed:
#!/bin/bash
# Continue from previous directory
cd u-boot
# Try a more comprehensive git log command
echo "=== ALL Changes between v2024.10 and v2025.01 ==="
git log v2024.10..v2025.01 --oneline | wc -l
# Try different search terms for Rockchip and RK356x
echo -e "\n=== Broader search for Rockchip changes ==="
git log v2024.10..v2025.01 --oneline | grep -i "rockchip\|rk35\|rk356"
# Check if there are any ARM64 changes that might benefit the board
echo -e "\n=== ARM64 architecture changes ==="
git log v2024.10..v2025.01 --oneline | grep -i "arm64\|aarch64"
# Check documentation for release notes
echo -e "\n=== Documentation/changes for 2025.01 ==="
find doc -type f | xargs grep -l "2025" | xargs cat | grep -A 10 -B 10 "2025.01" || echo "No specific documentation found"
Length of output: 3016
🏁 Script executed:
#!/bin/bash
cd u-boot
# Count total changes between the versions
echo "=== Total commits between v2024.10 and v2025.01 ==="
git rev-list --count v2024.10..v2025.01
# Look for any critical fix commits
echo -e "\n=== Critical fixes between versions ==="
git log v2024.10..v2025.01 --oneline | grep -i "fix\|bug\|issue\|crash\|hang" | head -15
# Get a summary of changed areas (which directories had the most changes)
echo -e "\n=== Directories with most changes ==="
git diff --stat v2024.10..v2025.01 | grep -v "^ " | sort -nr -k3 | head -10
# Look specifically for device tree changes for ARM64 or Rockchip
echo -e "\n=== Device tree changes for ARM64/Rockchip ==="
git diff --name-only v2024.10..v2025.01 | grep -E "arch/arm/dts|drivers/rockchip|rockchip.*dtsi" | head -10
Length of output: 1263
🏁 Script executed:
#!/bin/bash
cd u-boot
# Show the detailed commit message for the single commit between versions
echo "=== Detailed commit message between v2024.10 and v2025.01 ==="
git log -1 --pretty=full v2024.10..v2025.01
# Check if this commit affects any files related to Rockchip
echo -e "\n=== Files changed in this commit ==="
git diff --name-only v2024.10..v2025.01
# Check specifically for any RK3566/RK3568 related files in the repository
echo -e "\n=== RK3566/RK3568 files in repository ==="
find . -type f -name "*rk356*" | sort
Length of output: 65867
@EvilOlaf I've analyzed the changes between U-Boot v2024.10 and v2025.01 specifically looking for improvements related to RK3566/RK3568 platforms or the Radxa Zero 3W board.
From my investigation:
- There appear to be minimal changes between these versions that impact the RK3566/RK3568 platform
- While there are some device tree file modifications for other boards using these SoCs, there aren't any specific improvements for the Radxa Zero 3W board
- The core RK3568 driver code has some changes, but they don't appear to add significant new functionality
Based on this analysis, I don't see compelling improvements that would justify a version bump from v2024.10 to v2025.01 for this specific board. The current configuration using v2024.10 appears appropriate, as there are no critical fixes or feature enhancements in v2025.01 that would benefit this particular implementation.
ʕ•ᴥ•ʔ
config/boards/radxa-zero-3w.csc
Outdated
| } | ||
|
|
||
| # Override family config for this board; let's avoid conditionals in family config. | ||
| function post_family_config__radxa-zero3_use_vendor_uboot() { |
There was a problem hiding this comment.
This will force current to use old vendor uboot as well. Is this intended?
There was a problem hiding this comment.
I copied this part straight from radxa-zero3.csc, and didn't touch it, so I am unsure of the history here.
config/boards/radxa-zero-3w.csc
Outdated
| IMAGE_PARTITION_TABLE="gpt" | ||
| BOOT_SCENARIO="spl-blobs" | ||
| BOOTFS_TYPE="fat" # Only for vendor/legacy | ||
| AIC8800_TYPE="sdio" |
There was a problem hiding this comment.
I don't understand why this split is necessary. Is it just about the additional wifi extension? If so I guess a simple if can handle whether this should come into play or not.
There was a problem hiding this comment.
The DTB files are split in the latest linux-dtb-* packages -- the old one doesn't even exist anymore.
There was a problem hiding this comment.
Hm. First I was like 'let's just add some if BOARD = 3w, then install wifi stuff' but then realized this isn't going to work, because board model is detected at actual boot.
So either split models or install wifi drivers on both models where on 3E they are simply never used. I guess former is better.
|
The PR would be a lot easier to read if I also deleted The only changes are these: diff --git a/config/boards/radxa-zero3.csc b/config/boards/radxa-zero3.csc
index f0cbc950b..10b5b6da2 100644
--- a/config/boards/radxa-zero3.csc
+++ b/config/boards/radxa-zero3.csc
@@ -1,5 +1,5 @@
# Rockchip RK3566 quad core
-BOARD_NAME="Radxa ZERO 3"
+BOARD_NAME="Radxa ZERO 3W"
BOARDFAMILY="rk35xx"
BOARD_MAINTAINER=""
BOOTCONFIG="radxa-zero3-rk3566_defconfig"
@@ -7,10 +7,12 @@ KERNEL_TARGET="vendor,edge"
KERNEL_TEST_TARGET="vendor"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
-BOOT_FDT_FILE="rockchip/rk3566-radxa-zero3.dtb"
+BOOT_FDT_FILE="rockchip/rk3566-radxa-zero-3w.dtb"
IMAGE_PARTITION_TABLE="gpt"
BOOT_SCENARIO="spl-blobs"
BOOTFS_TYPE="fat" # Only for vendor/legacy
+AIC8800_TYPE="sdio"
+enable_extension "radxa-aic8800"
function post_family_config_branch_edge__use_mainline_dtb_name() {
unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to |
|
@kelvie mainline U-Boot is able to detect what board variant is running and should load correct Maybe an issue is that When I sent these boards device tree's upstream to mainline Linux, they where only ever tested with mainline U-Boot. If you have an issue with board detection in mainline U-Boot, please let me know so that it can be fixed. |
So what's the action here? unset Edit: Ah, I think I see what I need to do here, what I'm really trying to do is make |
The upstream aic8800 also works with the latest kernels (up to 6.13), so I removed the kernel version check, and added a warning message when AIC8800_TYPE isn't set, rather than silently failing. That was annoying to debug.
github-actions
bot
added
size/small
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
config/boards/radxa-zero3.csc (1)
15-17: Document AIC8800_TYPE usage more explicitlyThe comment indicates this is "technically only needed for 3W," but future maintainers may benefit from more detailed documentation explaining why this is specifically needed for the 3W model and not needed for other variants.
Consider enhancing the comment to provide more context:
-# technically only needed for 3W +# AIC8800 WiFi/BT is only present on the Radxa Zero 3W model +# Setting this variable ensures proper driver installation during build
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
config/boards/radxa-zero3.csc(3 hunks)extensions/radxa-aic8800.sh(1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- extensions/radxa-aic8800.sh
🔇 Additional comments (5)
config/boards/radxa-zero3.csc (5)
6-6: LGTM: Added "current" target to KERNEL_TARGETAdding the "current" target to KERNEL_TARGET expands the build options for this board, which aligns with the PR objectives of supporting the new Radxa Zero 3W sub-board.
21-24: LGTM: Added mainline DTB configuration for current branchThis function correctly unsets BOOT_FDT_FILE to allow U-Boot to detect and set the appropriate device tree file, mirroring the existing approach for the edge branch.
Note that this function is almost identical to
post_family_config_branch_edge__use_mainline_dtb_name. If more configurations need to be shared between branches in the future, consider refactoring to reduce duplication.
32-32: LGTM: Improved function naming conventionRenaming the function to include the branch name (
branch_vendor) improves clarity and follows a more structured naming convention consistent with other branch-specific functions.
46-59: LGTM: Added mainline U-Boot support for current branchThis addition properly configures mainline U-Boot for the current branch, which addresses Kwiboo's comments about ensuring mainline U-Boot is used with mainline Linux.
I notice you're using v2025.01 for the current branch while the edge branch uses v2024.10. This forward-looking version selection aligns with Kwiboo's recommendation to use v2025.01.
46-50: Verify U-Boot configuration works with both Zero 3W and 3E modelsBased on the PR discussion, mainline U-Boot should be able to detect board variants automatically. This configuration appears to be set up correctly to accomplish that goal.
Verify that this configuration works as expected by testing both the 3W and 3E variants with this U-Boot configuration to ensure proper board detection.
| @@ -32,6 +43,21 @@ function post_family_config__radxa-zero3_use_vendor_uboot() { | |||
| } | |||
| } | |||
|
|
|||
| function post_family_config_branch_current__radxa-zero3_use_mainline_uboot() { | |||
There was a problem hiding this comment.
This is copy+pasted -- let me know if I should update the edge one as well, I don't really want to test it because I have to wire up the serial port again :)
Yes -- as Kwiboo noted, in cases where u-boot can autodetect the board (and thus set fdtfile), we can simply leave BOOT_FDT_FILE unset. |
|
So @Kwiboo, I think I made the requested changes, any other comments before we can merge this and get this working for others? This is a great board spec-wise, and it'd be great for others with it to hopefully spend a lot less time I did trying to get the GPU to work on wayland! |
|
There are no changes that affect GPU? From what it looks like this is more about adding wifi drivers by default? Am I missing something? |
Sorry if I was unclear, being able to use |
kelvie
changed the title
This actually hasn't much to do with kernel version, depending on features wanted of course. the On the bottom line this PR is about
|
igorpecovnik
added
Work in progress
|
IMHO leaving both boards combined (it works nicely this way) I'd say simply add the driver so it is always present. If anyone objects to this way speak now or forever hold your peace ;) |
|
For mainline Linux I split the boards into separate device trees because they are different boards with different hardware components. For mainline U-Boot I added the automatic detection and setting My recommendation is to keep support for both 3E/3W variants in a single image/target. The |
|
Thank you for the background.
I can make these changes and test these over the weekend (North American time), or tonight as my free time permits. |
|
I just realized I don't have another board to test, so this will have to wait until next week, or whenever aliexpress delivers my new radxa zero |
I tested this with
currenton bookworm, and it works with wifi, and with wayland (not sure if the gpu works, but I'm running a program using the wgpu rust library out-of-the-box on it).It seems the dtb files got split into zero-3w and zero-3e, and I don't have a 3e to test with, so I wrote a new one for 3w (and left the old one, not sure if anyone uses it, but I'd suggest creating a separate one for 3e, then deleting it).
The upstream aic8800 also works with the latest kernels (up to 6.13), so I removed the kernel version check, and added a warning message when AIC8800_TYPE isn't set, rather than silently failing. That was annoying to debug.
How Has This Been Tested?
./compile.sh BOARD=radxa-zero-3w BRANCH=current RELEASE=bookworm BUILD_MINIMAL=yes BUILD_DESKTOP=no KERNEL_CONFIGURE=noChecklist: