Skip to content

Commit 8db509b

Browse files
committed
rock-s0: bump u-boot v2024.10 -> v2026.07 (build on trixie hosts)
Same trixie/SWIG-4.3 failure as rockpi-s: u-boot v2024.10's pre-generated pylibfdt wrapper won't compile on trixie, killing the uboot artifact. Bump to v2026.07 (the rk3308 tag luckfox-rk3308b-nova already builds). rock-s0 carries one board patch (1120-mmcBootOnRockS0v1-1: SPL MMC access on Rock S0 v1.1) — copied to patch/u-boot/v2026.07/board_rock-s0/ so the boot fix isn't lost. Keeps rock-s0-rk3308_defconfig, uart0 DDR blob, BL31, binman. Needs verification: the carried patch must still apply to v2026.07's rk3308-rock-s0-u-boot.dtsi (rebase if context shifted, or drop if upstreamed), plus an on-target boot/MMC check. Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent 569ff24 commit 8db509b

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

config/boards/rock-s0.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ SERIALCON="ttyS0"
1717
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
1818
HAS_VIDEO_OUTPUT="no"
1919

20-
BOOTBRANCH_BOARD="tag:v2024.10"
21-
BOOTPATCHDIR="v2024.10"
20+
BOOTBRANCH_BOARD="tag:v2026.07-rc4"
21+
BOOTPATCHDIR="v2026.07"
2222
BOOT_SCENARIO="binman"
2323
DDR_BLOB="rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin"
2424
BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Brent Roman <genosenosor@gmail.com>
3+
Date: Sat, 16 Nov 2024 20:50:41 -0800
4+
Subject: Ensure Rock S0 v1.1 boards u-boot SPL can access MMC card
5+
6+
Signed-off-by: Brent Roman <genosenosor@gmail.com>
7+
---
8+
arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | 15 ++++++++++
9+
1 file changed, 15 insertions(+)
10+
11+
diff --git a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
12+
index 84ca2ee0d5..c0d7f7b651 100644
13+
--- a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
14+
+++ b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi
15+
@@ -5,10 +5,25 @@
16+
&emmc_pwren {
17+
bootph-pre-ram;
18+
bootph-some-ram;
19+
};
20+
21+
+&pcfg_pull_down {
22+
+ bootph-pre-ram;
23+
+ bootph-some-ram;
24+
+};
25+
+
26+
+&sdmmc {
27+
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_pwren &sdmmc_bus4>;
28+
+};
29+
+
30+
+&sdmmc_pwren {
31+
+ bootph-pre-ram;
32+
+ bootph-some-ram;
33+
+ rockchip,pins = <4 RK_PD6 0 &pcfg_pull_down>;
34+
+};
35+
+
36+
&uart0 {
37+
bootph-all;
38+
clock-frequency = <24000000>;
39+
};
40+
41+
--
42+
Created with Armbian build tools https://github.com/armbian/build

0 commit comments

Comments
 (0)