Skip to content

Commit 22a5c46

Browse files
HeyMecoigorpecovnik
authored andcommitted
Rock-5B-Plus: Fix Mainline u-boot
Tested on Rock-5B-Plus: - SD-Card (empty SPI) - NVMe (SPI flashed)
1 parent ffd4257 commit 22a5c46

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
BOARD_NAME="Rock 5B Plus"
33
BOARDFAMILY="rockchip-rk3588"
44
BOARD_MAINTAINER="HeyMeco fridtjof"
5-
BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
5+
BOOTCONFIG="rock5b-rk3588_defconfig"
66
KERNEL_TARGET="edge,vendor"
77
KERNEL_TEST_TARGET="vendor,edge"
88
FULL_DESKTOP="yes"
99
BOOT_LOGO="desktop"
10+
BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
1011
BOOT_SCENARIO="spl-blobs"
1112
BOOT_SUPPORT_SPI="yes"
1213
BOOT_SPI_RKSPI_LOADER="yes"
@@ -32,14 +33,18 @@ function post_family_tweaks__rock5bplus_udev_rules() {
3233
function post_family_config__rock5b_plus_use_mainline_uboot() {
3334
display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
3435

36+
# To reuse ATF code in rockchip64_common, let's change the BOOT_SCENARIO and call prepare_boot_configuration() again
37+
BOOT_SCENARIO="tpl-blob-atf-mainline"
38+
prepare_boot_configuration
39+
3540
declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
3641
declare -g BOOTCONFIG="rock5b-rk3588_defconfig"
3742
declare -g BOOTDELAY=1
3843
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
3944
declare -g BOOTBRANCH="tag:v2025.10"
4045
declare -g BOOTPATCHDIR="v2025.10"
4146
declare -g BOOTDIR="u-boot-${BOARD}"
42-
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
47+
declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
4348
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
4449

4550
# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go

0 commit comments

Comments
 (0)