Skip to content

Commit 61b3aa2

Browse files
chainsxigorpecovnik
authored andcommitted
lckfb-taishanpi: update u-boot patches, add current&edge kernel support
1 parent cb93408 commit 61b3aa2

File tree

4 files changed

+1582
-9
lines changed

4 files changed

+1582
-9
lines changed

config/boards/lckfb-taishanpi.csc

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,27 @@
22
BOARD_NAME="LCKFB Taishan Pi"
33
BOARDFAMILY="rk35xx"
44
BOARD_MAINTAINER=""
5-
BOOTCONFIG="radxa-zero3-rk3566_defconfig"
6-
KERNEL_TARGET="vendor"
7-
BOOT_FDT_FILE="rockchip/rk3566-taishanpi-v10.dtb"
5+
BOOTCONFIG="lckfb-tspi-rk3566_defconfig"
6+
BOOT_SOC="rk3566"
7+
KERNEL_TARGET="vendor,current,edge"
8+
KERNEL_TEST_TARGET="current,vendor"
9+
BOOT_FDT_FILE="rockchip/rk3566-lckfb-tspi.dtb"
810
BOOT_SCENARIO="spl-blobs"
911
IMAGE_PARTITION_TABLE="gpt"
1012

1113
# Override family config for this board; let's avoid conditionals in family config.
1214
function post_family_config__tspi_use_radxa_vendor() {
13-
BOOTSOURCE='https://github.com/radxa/u-boot.git'
14-
BOOTBRANCH='branch:rk35xx-2024.01'
15-
BOOTPATCHDIR="u-boot-radxa-latest"
16-
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
17-
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
15+
display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
16+
BOOTDELAY=1
17+
BOOTSOURCE="https://github.com/u-boot/u-boot"
18+
BOOTBRANCH="tag:v2025.04"
19+
BOOTPATCHDIR="v2025.04"
20+
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
21+
UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
22+
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
23+
24+
# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
1825
function write_uboot_platform() {
19-
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
26+
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
2027
}
2128
}

0 commit comments

Comments
 (0)