-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Rockchip u-boot "binman" BOOT_SCENARIO (#7505)
* rockchip64: add `BOOT_SCENARIO=binman` for mainline u-boot - drop special handling for 3308's `legacy` branch - rpardini: note how SPI/mtd is not yet supported for this scenario Co-authored-by: Ricardo Pardini <[email protected]> (squash/splits, shellfmt) * `rock-s0`/`rockpi-s`: use `BOOT_SCENARIO=binman`; move blobs to armbian/rkbin - Move rk3308 boot blobs to armbian/rkbin - delete obsolete ones - Alter rock-s0 and rockpi-s to use the new "binman" BOOT_SCENARIO Co-authored-by: Ricardo Pardini <[email protected]> (shellfmt; small fixes; squashes)
- Loading branch information
Showing
6 changed files
with
150 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,32 @@ | ||
# Rockchip RK3308 quad core 512MB SoC WiFi | ||
# https://radxa.com/products/rocks/s0 | ||
|
||
# This board is very similar to the older RockPi-S model | ||
source "${SRC}/config/boards/rockpi-s.conf" | ||
|
||
BOARD_NAME="Rock S0" | ||
BOARD_MAINTAINER="brentr" | ||
BOARDFAMILY="rockchip64" | ||
BOOTCONFIG="rock-s0-rk3308_defconfig" | ||
BOOT_FDT_FILE="rockchip/rk3308-rock-s0.dtb" | ||
KERNEL_TARGET="current,edge" | ||
KERNEL_TEST_TARGET="current" | ||
BOARDFAMILY=rockchip64 | ||
BOARD_MAINTAINER=brentr | ||
|
||
BOOTCONFIG=rock-s0-rk3308_defconfig | ||
BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb | ||
|
||
KERNEL_TARGET=current,edge | ||
KERNEL_TEST_TARGET=current | ||
|
||
DEFAULT_CONSOLE=serial | ||
SERIALCON=ttyS0 | ||
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost" | ||
HAS_VIDEO_OUTPUT=no | ||
|
||
BOOTBRANCH_BOARD=tag:v2024.10 | ||
BOOTPATCHDIR=v2024.10 | ||
BOOT_SCENARIO=binman | ||
DDR_BLOB=rk33/rk3308_ddr_589MHz_uart0_m0_v2.07.bin | ||
BL31_BLOB=rk33/rk3308_bl31_v2.26.elf | ||
|
||
OVERLAY_PREFIX=rk3308 | ||
|
||
function post_family_config__rocks0() { | ||
declare -g BOOTDIR="u-boot-${BOARD}" | ||
declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd | ||
|
||
unset family_tweaks_bsp # disable from rockchip64_common | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-140 KB
packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_v2.06.136sd.bin
Binary file not shown.
Binary file removed
BIN
-274 KB
packages/blobs/rockchip/rk3308_loader_ddr589MHz_uart0_m0_v2.06.136sd.bin
Binary file not shown.
42 changes: 42 additions & 0 deletions
42
patch/u-boot/v2024.10/board_rock-s0/1120-mmcBootOnRockS0v1-1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Brent Roman <[email protected]> | ||
Date: Sat, 16 Nov 2024 20:50:41 -0800 | ||
Subject: Ensure Rock S0 v1.1 boards u-boot SPL can access MMC card | ||
|
||
Signed-off-by: Brent Roman <[email protected]> | ||
--- | ||
arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | 15 ++++++++++ | ||
1 file changed, 15 insertions(+) | ||
|
||
diff --git a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | ||
index 84ca2ee0d5..c0d7f7b651 100644 | ||
--- a/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | ||
+++ b/arch/arm/dts/rk3308-rock-s0-u-boot.dtsi | ||
@@ -5,10 +5,25 @@ | ||
&emmc_pwren { | ||
bootph-pre-ram; | ||
bootph-some-ram; | ||
}; | ||
|
||
+&pcfg_pull_down { | ||
+ bootph-pre-ram; | ||
+ bootph-some-ram; | ||
+}; | ||
+ | ||
+&sdmmc { | ||
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_pwren &sdmmc_bus4>; | ||
+}; | ||
+ | ||
+&sdmmc_pwren { | ||
+ bootph-pre-ram; | ||
+ bootph-some-ram; | ||
+ rockchip,pins = <4 RK_PD6 0 &pcfg_pull_down>; | ||
+}; | ||
+ | ||
&uart0 { | ||
bootph-all; | ||
clock-frequency = <24000000>; | ||
}; | ||
|
||
-- | ||
Created with Armbian build tools https://github.com/armbian/build |