Skip to content
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

Bump two leftover radxa rk35xx uboot to next-dev-v2024.10 #7832

Merged
merged 1 commit into from
Feb 16, 2025

Conversation

nyanmisaka
Copy link
Collaborator

Description

There are two boards that were missed when upgrading to next-dev-v2024.10. Bump version for them too.

config/boards/rock-5c.conf
config/boards/mixtile-edge2.csc

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.

  • ./compile.sh build ARTIFACT_IGNORE_CACHE=yes BOARD=rock-5c BRANCH=vendor BUILD_DESKTOP=no BUILD_MINIMAL=no KERNEL_CONFIGURE=yes RELEASE=noble

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
  • 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 Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Feb 15, 2025
@amazingfate
Copy link
Contributor

I think the uboot config in board config can just get dropped, just like other rk3588 boards, default uboot source is defined in family.

@nyanmisaka
Copy link
Collaborator Author

I think the uboot config in board config can just get dropped, just like other rk3588 boards, default uboot source is defined in family.

I thought so at first, but wasn't sure.

@amazingfate
Copy link
Contributor

For mixtile edge2 there should be additional changes:

--- a/config/boards/mixtile-edge2.csc
+++ b/config/boards/mixtile-edge2.csc
@@ -1,6 +1,7 @@
 # Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
 BOARD_NAME="Mixtile Edge 2"
-BOARDFAMILY="rockchip64"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge,vendor"

For all rk356x boards they should use rk35xx as BOARDFAMILY, and when building mainline kernels, the LINUXFAMILY will be set to rockchip64.
And there should be a global BOOTCONFIG.

just remove these leftover overrides.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
Co-authored-by: amazingfate <liujianfeng1994@gmail.com>
@nyanmisaka
Copy link
Collaborator Author

For mixtile edge2 there should be additional changes:

--- a/config/boards/mixtile-edge2.csc
+++ b/config/boards/mixtile-edge2.csc
@@ -1,6 +1,7 @@
 # Rockchip RK3568 quad core 4GB-8GB GBE PCIe USB3 SATA NVMe
 BOARD_NAME="Mixtile Edge 2"
-BOARDFAMILY="rockchip64"
+BOARDFAMILY="rk35xx"
+BOOTCONFIG="mixtile-edge2-rk3568_defconfig"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge,vendor"

For all rk356x boards they should use rk35xx as BOARDFAMILY, and when building mainline kernels, the LINUXFAMILY will be set to rockchip64. And there should be a global BOOTCONFIG.

Thx for your explanation

Copy link
Contributor

@schwar3kat schwar3kat left a comment

Choose a reason for hiding this comment

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

Tested on Rock 5c:
Vendor Noble Gnome (full test)
Vendor Minimal Bookworm (full test)
Current Minimal Bookworm (boot)

@github-actions github-actions bot added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Feb 16, 2025
@igorpecovnik igorpecovnik merged commit b8423db into main Feb 16, 2025
10 checks passed
@igorpecovnik igorpecovnik deleted the radxa-uboot-24.10 branch February 16, 2025 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like 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.

4 participants