Rock5B+: Use Collabora u-boot for all branches

[HeyMeco]

Description

The 2024.10 Rockchip vendor u-boot has issues with Ubuntu Noble hosts.
To mitigate on Rock5B+ (platinum support) we can switch to collabora u-boot for both vendor and edge scenarios.

Note: rock5b-rk3588_defconfig in collabora includes a DDR5 check that determines it to be a Rock-5B-Plus or DDR4 for Rock5B

GitHub Issue: #8227
Jira reference number AR-2699

Documentation summary for feature / change

1. Add Family overwrite in board config to use collabora u-boot
2. Switch both configurations to collabora rockchip branch
3. Add boot order patch SD - NVME - EMMC -...

How Has This Been Tested?

• Boot Image with vendor kernel
• Boot Image with edge kernel
• Install to NVMe & SPI
• Switch NVMe drive slots and preserve booting functionality

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

[coderabbitai]

Walkthrough

A new function was introduced to provide vendor-specific mainline U-Boot configuration for the Rock 5B board, setting global variables and helper functions for handling U-Boot binaries. The existing edge branch configuration was updated to use the Collabora GitLab mainline U-Boot repository with the rockchip branch instead of a specific tag from GitHub. Additionally, a branch check was removed from a function configuring U-Boot SPI environment settings, causing these configurations to always apply regardless of branch. No other functional changes were made.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~15 minutes

Assessment against linked issues

Objective	Addressed	Explanation
Ensure Rock 5B boards boot reliably by updating U-Boot configuration (AR-2699)	✅

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes found.

Possibly related PRs

• coolpi-genbook: Add Support for vendor branch #8275: Both PRs introduce or update vendor branch support for board-specific mainline U-Boot configuration, including helper functions for U-Boot binary handling.
• Rock-5B-Plus: Align Edge 6.16 with upstream #8338: Both PRs modify the post_family_config_branch_edge__rock-5b_use_mainline_uboot function, but with different branch targets and update scopes.
• lckfb-taishanpi: update u-boot patches, add current&edge kernel support #8428: Both PRs adjust board-specific configurations for switching to mainline U-Boot and redefining U-Boot handling functions.

Suggested labels

Ready to merge, BSP

Suggested reviewers

• clee
• joekhoobyar
• brentr
• prahal
• rpardini
• krachlatte
• lanefu
• ahoneybun
• amazingfate
• catalinii
• paolosabatino
• TheSnowfield
• SuperKali
• Tonymac32
• TRSx80
• JohnTheCoolingFan
• pyavitz
• efectn
• schwar3kat
• ColorfulRhino
• igorpecovnik

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

---

📜 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 16742ea and 34e88c4.

⛔ Files ignored due to path filters (2)

• patch/u-boot/collabora-rockchip/0001-nvme-before-emmc.patch is excluded by !patch/**
• patch/u-boot/collabora-rockchip/cmd-fileenv-read-string-from-file-into-env.patch is excluded by !patch/**

📒 Files selected for processing (1)

• config/boards/rock-5b-plus.conf (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

• config/boards/rock-5b-plus.conf

✨ Finishing Touches

🧪 Generate unit tests

• Create PR with unit tests
• Post copyable unit tests in a comment

---

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

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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.
  • Explain this complex logic.
  • 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 explain this code block.
  • @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 explain its main purpose.
  • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate unit tests to generate unit tests for 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.

[EvilOlaf]

I don't think attaching u-boot to master is a good idea. I'd rather go for the latest tag and add patches on top if necessary.

[HeyMeco]

I don't think attaching u-boot to master is a good idea.

Usually agree, I guess here I think to just set it to master and then set it to a tag when available. Still doing some testing rn related to nvme.

[HeyMeco]

@EvilOlaf I did more testing and realized upstream didn't have all the necessary changes. I replaced it with collabora's branch and tested it extensively (see above). This is the best case now covering more scenarios than before

[EvilOlaf]

Other suggestion. Use latest tag and add this on top: https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/

[HeyMeco]

Other suggestion. Use latest tag and add this on top: https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/

I'll try this and see if it works with a rock5t patch from collabora's fork. If yes I'll switch both to latest with patch