Skip to content

rockchip64: bump some boards u-boot to v2026.04 #9662

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.

Sign up for GitHub

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
igorpecovnik merged 4 commits into from
Apr 14, 2026
Merged

rockchip64: bump some boards u-boot to v2026.04 #9662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94bd038
rockchip64: bump some boards u-boot to v2026.04
paolosabatino Apr 13, 2026
f8afbe3
Merge branch 'main' into rockchip64-uboot-v2026.04
paolosabatino Apr 13, 2026
8f4020e
get rid of disabled u-boot patch
paolosabatino Apr 13, 2026
a86840a
rockchip64: fix minor mistakes in CSC boards defconfig/dts
paolosabatino Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/boards/dusun-dsom-010r.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
DEFAULT_CONSOLE="serial"
DEFAULT_OVERLAYS="dusun-010r-rp3328b" # Enable, by default, the RP3328B carrier board devices
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
BOOTPATCHDIR="v2025.10"
BOOTBRANCH_BOARD="tag:v2026.04"
BOOTPATCHDIR="v2026.04"
BOOT_SCENARIO="binman-atf-mainline"
DDR_BLOB="rk33/rk3328_ddr_933MHz_v1.16.bin"

4 changes: 2 additions & 2 deletions config/boards/orangepi4-lts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ MODULES_EDGE="sprdbt_tty sprdwl_ng"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.rk3399"
BOOT_LOGO="desktop"
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
BOOTPATCHDIR="v2025.10"
BOOTBRANCH_BOARD="tag:v2026.04"
BOOTPATCHDIR="v2026.04"
BOOT_SCENARIO="binman"

function post_family_tweaks_bsp__OPi4lts() {
Expand Down
4 changes: 2 additions & 2 deletions config/boards/rk3318-box.tvb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ BOOT_SCENARIO="tpl-blob-atf-mainline"
DDR_BLOB="rk33/rk3318_ddr_333Mhz_v1.16.bin"
BOOT_SOC="rk3328"

BOOTBRANCH_BOARD="tag:v2025.10-rc5"
BOOTPATCHDIR="v2025.10"
BOOTBRANCH_BOARD="tag:v2026.04"
BOOTPATCHDIR="v2026.04"

enable_extension xorg-lima-serverflags

Expand Down
4 changes: 2 additions & 2 deletions config/boards/rockpi-e.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ KERNEL_TEST_TARGET="current"
DEFAULT_CONSOLE="serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
HAS_VIDEO_OUTPUT="no"
BOOTBRANCH_BOARD="tag:v2025.10-rc5"
BOOTPATCHDIR="v2025.10"
BOOTBRANCH_BOARD="tag:v2026.04"
BOOTPATCHDIR="v2026.04"
BOOT_SCENARIO="binman"

16 changes: 16 additions & 0 deletions patch/u-boot/v2026.04/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Alter the orangepi-rk3399_defconfig file to enable "External TPL",
because we want to use the Rockchip ddrbin in place of the u-boot TPL
It has to be set with the env variable ROCKCHIP_TPL when invoking make

diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
index 5dfbdeaf17..167c2b3f60 100644
--- a/configs/orangepi-rk3399_defconfig
+++ b/configs/orangepi-rk3399_defconfig
@@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-orangepi"
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3399=y
+CONFIG_ROCKCHIP_EXTERNAL_TPL=y
CONFIG_TARGET_EVB_RK3399=y
CONFIG_DEBUG_UART_BASE=0xFF1A0000
CONFIG_DEBUG_UART_CLOCK=24000000
Loading
Loading