Skip to content

Commit d9c43e1

Browse files
rockchip64: bump some boards u-boot to v2026.04 (#9662)
* rockchip64: bump some boards u-boot to v2026.04 * OrangePi4 LTS * Radxa Rockpi-E * Dusun DSOM 010R * rk3318-box tv box series * get rid of disabled u-boot patch * rockchip64: fix minor mistakes in CSC boards defconfig/dts
1 parent 7779c16 commit d9c43e1

15 files changed

+2764
-8
lines changed

config/boards/dusun-dsom-010r.csc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ KERNEL_TARGET="current,edge"
1010
KERNEL_TEST_TARGET="current"
1111
DEFAULT_CONSOLE="serial"
1212
DEFAULT_OVERLAYS="dusun-010r-rp3328b" # Enable, by default, the RP3328B carrier board devices
13-
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
14-
BOOTPATCHDIR="v2025.10"
13+
BOOTBRANCH_BOARD="tag:v2026.04"
14+
BOOTPATCHDIR="v2026.04"
1515
BOOT_SCENARIO="binman-atf-mainline"
1616
DDR_BLOB="rk33/rk3328_ddr_933MHz_v1.16.bin"
1717

config/boards/orangepi4-lts.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ MODULES_EDGE="sprdbt_tty sprdwl_ng"
1515
FULL_DESKTOP="yes"
1616
ASOUND_STATE="asound.state.rk3399"
1717
BOOT_LOGO="desktop"
18-
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
19-
BOOTPATCHDIR="v2025.10"
18+
BOOTBRANCH_BOARD="tag:v2026.04"
19+
BOOTPATCHDIR="v2026.04"
2020
BOOT_SCENARIO="binman"
2121

2222
function post_family_tweaks_bsp__OPi4lts() {

config/boards/rk3318-box.tvb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ BOOT_SCENARIO="tpl-blob-atf-mainline"
1212
DDR_BLOB="rk33/rk3318_ddr_333Mhz_v1.16.bin"
1313
BOOT_SOC="rk3328"
1414

15-
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
16-
BOOTPATCHDIR="v2025.10"
15+
BOOTBRANCH_BOARD="tag:v2026.04"
16+
BOOTPATCHDIR="v2026.04"
1717

1818
enable_extension xorg-lima-serverflags
1919

config/boards/rockpi-e.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ KERNEL_TEST_TARGET="current"
1010
DEFAULT_CONSOLE="serial"
1111
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
1212
HAS_VIDEO_OUTPUT="no"
13-
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
14-
BOOTPATCHDIR="v2025.10"
13+
BOOTBRANCH_BOARD="tag:v2026.04"
14+
BOOTPATCHDIR="v2026.04"
1515
BOOT_SCENARIO="binman"
1616

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Alter the orangepi-rk3399_defconfig file to enable "External TPL",
2+
because we want to use the Rockchip ddrbin in place of the u-boot TPL
3+
It has to be set with the env variable ROCKCHIP_TPL when invoking make
4+
5+
diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
6+
index 5dfbdeaf17..167c2b3f60 100644
7+
--- a/configs/orangepi-rk3399_defconfig
8+
+++ b/configs/orangepi-rk3399_defconfig
9+
@@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x3F8000
10+
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-orangepi"
11+
CONFIG_DM_RESET=y
12+
CONFIG_ROCKCHIP_RK3399=y
13+
+CONFIG_ROCKCHIP_EXTERNAL_TPL=y
14+
CONFIG_TARGET_EVB_RK3399=y
15+
CONFIG_DEBUG_UART_BASE=0xFF1A0000
16+
CONFIG_DEBUG_UART_CLOCK=24000000

0 commit comments

Comments
 (0)