Skip to content

Commit ec8c470

Browse files
EvilOlafKwiboo
authored andcommitted
radxa-zero3: add edge branch (6.9.y) by picking DT from linux-rockchip#for-next & using Kwiboo's 24.07 u-boot
- u-boot: - unset `BOOT_FDT_FILE` for edge branch; that lets Armbian bootscript use the fdtfile auto-detected and set by u-boot - unset `BOOTFS_TYPE`, since mainline u-boot can boot ext4 directly - kernel DTs from https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/tree/arch/arm64/boot/dts/rockchip?h=84a3d3b435e7c109d2141c5bbb9eaab146c94df0 Co-authored-by: Jonas Karlman <[email protected]> Co-authored-by: Ricardo Pardini <[email protected]> (null-patch to bare-dt)
1 parent d78a5ad commit ec8c470

File tree

4 files changed

+697
-2
lines changed

4 files changed

+697
-2
lines changed

config/boards/radxa-zero3.conf

+22-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ BOARD_NAME="Radxa ZERO 3"
33
BOARDFAMILY="rk35xx"
44
BOARD_MAINTAINER="Radxa"
55
BOOTCONFIG="radxa-zero3-rk3566_defconfig"
6-
KERNEL_TARGET="legacy,vendor"
6+
KERNEL_TARGET="legacy,vendor,edge"
77
FULL_DESKTOP="yes"
88
BOOT_LOGO="desktop"
99
BOOT_FDT_FILE="rockchip/rk3566-radxa-zero3.dtb"
1010
IMAGE_PARTITION_TABLE="gpt"
1111
BOOT_SCENARIO="spl-blobs"
12-
BOOTFS_TYPE="fat"
12+
BOOTFS_TYPE="fat" # Only for vendor/legacy
13+
14+
function post_family_config_branch_edge__use_mainline_dtb_name() {
15+
unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
16+
unset BOOTFS_TYPE # mainline u-boot can boot ext4 directly
17+
}
1318

1419
# Override family config for this board; let's avoid conditionals in family config.
1520
function post_family_config__radxa-zero3_use_vendor_uboot() {
@@ -25,3 +30,18 @@ function post_family_config__radxa-zero3_use_vendor_uboot() {
2530
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
2631
}
2732
}
33+
34+
function post_family_config_branch_edge__radxa-zero3_use_kwiboo_uboot() {
35+
BOOTCONFIG="radxa-zero-3-rk3566_defconfig"
36+
BOOTSOURCE='https://github.com/Kwiboo/u-boot-rockchip.git'
37+
BOOTBRANCH='branch:rk3xxx-2024.07'
38+
BOOTPATCHDIR="u-boot-zero3" # Empty
39+
40+
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
41+
42+
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
43+
44+
function write_uboot_platform() {
45+
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
46+
}
47+
}

0 commit comments

Comments
 (0)