8000 Update the version of U-boot used with Radxa rock 4 se to v2025.04 by trappiz · Pull Request #8115 · armbian/build · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update the version of U-boot used with Radxa rock 4 se to v2025.04 #8115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 25, 2025

Conversation

trappiz
Copy link
Contributor
@trappiz trappiz commented Apr 22, 2025

Update the version of U-boot used with Radxa rock 4 se to v2025.04.

Tested locally on my board after building an armbian image.

ubuntu@rock-4se:~$ strings /dev/mmcblk1 | grep U-Boot U-Boot SPL 2025.04-armbian-2025.04-S3482-P4a0b-H3d34-Va9af-Bb703-R448a (Apr 22 2025 - 10:05:17 +0000) U-Boot phase
U-Boot
FIT image for U-Boot with bl31 (TF-A)

Description

Update the version of U-boot used with Radxa rock 4 se.

GitHub issue reference:
Jira reference number [AR-9999]

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • Image built using armbian/build
  • Flashed and booted the system using latest version (v2025.04) of U-boot on a rock 4 se board.

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings

@trappiz trappiz requested a review from igorpecovnik as a code owner April 22, 2025 13:59
Copy link
Contributor
coderabbitai bot commented Apr 22, 2025

"""

Walkthrough

The changes update the board configuration file for the "Rock 4SE" board. The BOOTBRANCH_BOARD variable is changed from "tag:v2023.10-rc2" to "tag:v2025.04". The BOOTCONFIG variable is switched from "rock-pi-4-rk3399_defconfig" to "rock-4se-rk3399_defconfig". The BOOTPATCHDIR variable is removed entirely. Additionally, the device tree blob file specified by BOOT_FDT_FILE is changed from "rockchip/rk3399-rock-pi-4b.dtb" to "rockchip/rk3399-rock-4se.dtb". No other modifications or logic changes are present in the configuration file.

Possibly related PRs

  • radxa-zero3: bump mainline uboot #8071: Updates board configuration files to bump the U-Boot bootloader version to v2025.04 and adjust related variables, with differing handling of the BOOTPATCHDIR variable.

Suggested labels

ready to merge

Suggested reviewers

  • igorpecovnik
  • EvilOlaf
    """

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0c2938b and 0958498.

📒 Files selected for processing (1)
  • config/boards/rock-4se.csc (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • config/boards/rock-4se.csc

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added 05 Milestone: Second quarter release size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Apr 22, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 22, 2025
Copy link
Contributor
@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3af4354 and 7f8ecb3.

📒 Files selected for processing (1)
  • config/boards/rock-4se.csc (1 hunks)
🔇 Additional comments (1)
config/boards/rock-4se.csc (1)

5-5:

✅ Verification successful

Confirm U-Boot version bump and tag syntax.

The BOOTBRANCH_BOARD value was updated to "tag:v2025.04" to pick up the new U‑Boot release. Please verify that this tag name exactly matches an existing tag in the U‑Boot repository; otherwise the build will fall back to the wrong branch.


🏁 Script executed:

#!/bin/bash
# Verify that the tag exists upstream
if git ls-remote https://github.com/u-boot/u-boot.git | grep -q "refs/tags/v2025.04\$"; then
  echo "✔ Tag v2025.04 found in u-boot repo"
else
  echo "❌ Tag v2025.04 not found; please check the tag name"
  exit 1
fi

Length of output: 165


✔ U-Boot tag v2025.04 exists and syntax is correct

  • Verified in config/boards/rock-4se.csc (line 5): BOOTBRANCH_BOARD="tag:v2025.04"
  • The v2025.04 tag is present in the upstream U‑Boot repository, so no further changes are needed.

@EvilOlaf
Copy link
Member

emmc boot works too?

@trappiz
Copy link
Contributor Author
trappiz commented Apr 22, 2025 via email

Copy link
Contributor
@Kwiboo Kwiboo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
should really be changed to
BOOT_FDT_FILE="rockchip/rk3399-rock-4se.dtb"

BOOT_SCENARIO="spl-blobs" should not really be needed, this board should probably use blobless or binman

@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Apr 22, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 22, 2025
@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Apr 22, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 22, 2025
@EvilOlaf
Copy link
Member

Known issue on rock 4 se with emmc boot?

No known issues but wouldn't be the first time to introduce regressions on version bump ;)

trappiz added 3 commits April 24, 2025 20:31
Update the version of U-boot used with rock 4 se.

Tested locally on my board after building an armbian image.

ubuntu@rock-4se:~$ strings /dev/mmcblk1 | grep U-Boot
U-Boot SPL 2025.04-armbian-2025.04-S3482-P4a0b-H3d34-Va9af-Bb703-R448a (Apr 22 2025 - 10:05:17 +0000)
U-Boot phase
U-Boot
FIT image for U-Boot with bl31 (TF-A)
@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Apr 24, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 24, 2025
@Kwiboo
Copy link
Contributor
Kwiboo commented Apr 24, 2025

@trappiz as I mentioned in a prior comment the existing BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb" is looking very strange and should probably be changed to BOOT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" or you may end up booting into Linux using a device tree for a different board.

Revert BOOTCONFIG and update BOOT_FDT_FILE="rk3399-rock-4se.dtd"
@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Apr 25, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 25, 2025
Set BOOTCONFIG="rock-4se-rk3399_defconfig"
@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Apr 25, 2025
@coderabbitai coderabbitai bot added the Ready to merge Reviewed, tested and ready for merge label Apr 25, 2025
@trappiz
Copy link
Contributor Author
trappiz commented Apr 25, 2025

@trappiz as I mentioned in a prior comment the existing BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb" is looking very strange and should probably be changed to BOOT_FDT_FILE="rockchip/rk3399-rock-4se.dtb" or you may end up booting into Linux using a device tree for a different board.

Been updated now :)

@igorpecovnik
Copy link
Member

This ready to merge now?

@trappiz
Copy link
Contributor Author
trappiz commented Apr 25, 2025

This ready to merge now?

Should be ready to merge. However Im not able to test it until next week... :/

@igorpecovnik igorpecovnik changed the title Update rock-4se.csc Update the version of U-boot used with Radxa rock 4 se to v2025.04 Apr 25, 2025
@igorpecovnik igorpecovnik merged commit f4783ec into armbian:main Apr 25, 2025
11 checks passed
@igorpecovnik
Copy link
Member

However Im not able to test it until next week... :/

No problem. If you want to be more serious about this board, check this.

@igorpecovnik
Copy link
Member

https://paste.armbian.com/beducabasa It doesn't build, hmm. Probably patch folder should be set to BOOTPATCHDIR='v2025.04'

@trappiz
Copy link
Contributor Author
trappiz commented Apr 26, 2025 via email

@igorpecovnik
Copy link
Member

I think this can be related to the change of BOOTCONFIG.

No, that is unrelated. BOOTPATCHDIR tells where to look for patches and they are not compatible with the choosen uboot version. This is expected. Both things has to be aligned and if this device does not need any patches, it has to be set to empty folder. But try as proposed first from previous post.

@trappiz
Copy link
Contributor Author
trappiz commented Apr 27, 2025

I think this can be related to the change of BOOTCONFIG.

No, that is unrelated. BOOTPATCHDIR tells where to look for patches and they are not compatible with the choosen uboot version. This is expected. Both things has to be aligned and if this device does not need any patches, it has to be set to empty folder. But try as proposed first from previous post.

Created #8129 now. Lets hope it resolves it

@igorpecovnik
Copy link
Member

Lets hope it resolves it

Yes, now its all green.

https://github.com/armbian/os/actions/runs/14696507346/job/41239116465

CelestialCrafter pushed a commit to CelestialCrafter/armbian-build that referenced this pull request May 11, 2025
…rmbian#8115)

* Update rock-4se.csc

Update the version of U-boot used with rock 4 se.

Tested locally on my board after building an armbian image.

ubuntu@rock-4se:~$ strings /dev/mmcblk1 | grep U-Boot
U-Boot SPL 2025.04-armbian-2025.04-S3482-P4a0b-H3d34-Va9af-Bb703-R448a (Apr 22 2025 - 10:05:17 +0000)
U-Boot phase
U-Boot
FIT image for U-Boot with bl31 (TF-A)

* Use BOOTCONFIG="rock-4se-rk3399_defconfig" and remove BOOTPATCHDIR

* Removed old comment

* Update rock-4se.csc

Revert BOOTCONFIG and update BOOT_FDT_FILE="rk3399-rock-4se.dtd"

* Update rock-4se.csc

Set BOOTCONFIG="rock-4se-rk3399_defconfig"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
05 Milestone: Second quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review 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.

4 participants
0