From 6388006b5b4dafe030beddc742544c2beeb428df Mon Sep 17 00:00:00 2001 From: Jianfeng Liu Date: Sun, 29 May 2022 23:21:27 +0800 Subject: [PATCH] add spi boot support for rock-3a (#3838) --- config/boards/rock-3a.conf | 1 + .../families/include/rockchip64_common.inc | 22 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf index c1c871cbd5..67dd8c4900 100644 --- a/config/boards/rock-3a.conf +++ b/config/boards/rock-3a.conf @@ -8,3 +8,4 @@ BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb" BOOT_SCENARIO="spl-blobs" WIREGUARD="no" +BOOT_SUPPORT_SPI="yes" diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index af5044fd0c..f736f83c65 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -169,10 +169,24 @@ uboot_custom_postprocess() { fi if [[ $BOOT_SUPPORT_SPI == yes ]]; then - tools/mkimage -n $BOOT_SOC -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin rkspi_tpl_spl.img - dd if=/dev/zero of=rkspi_loader.img count=8128 status=none - dd if=rkspi_tpl_spl.img of=rkspi_loader.img conv=notrunc status=none - dd if=u-boot.itb of=rkspi_loader.img seek=768 conv=notrunc status=none + if [[ $BOARD == "rock-3a" ]]; then + dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=16 + /sbin/parted -s rkspi_loader.img mklabel gpt + /sbin/parted -s rkspi_loader.img unit s mkpart idbloader 64 7167 + /sbin/parted -s rkspi_loader.img unit s mkpart vnvm 7168 7679 + /sbin/parted -s rkspi_loader.img unit s mkpart reserved_space 7680 8063 + /sbin/parted -s rkspi_loader.img unit s mkpart reserved1 8064 8127 + /sbin/parted -s rkspi_loader.img unit s mkpart uboot_env 8128 8191 + /sbin/parted -s rkspi_loader.img unit s mkpart reserved2 8192 16383 + /sbin/parted -s rkspi_loader.img unit s mkpart uboot 16384 32734 + dd if=idbloader.img of=rkspi_loader.img seek=64 conv=notrunc + dd if=u-boot.itb of=rkspi_loader.img seek=16384 conv=notrunc + else + tools/mkimage -n $BOOT_SOC -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin rkspi_tpl_spl.img + dd if=/dev/zero of=rkspi_loader.img count=8128 status=none + dd if=rkspi_tpl_spl.img of=rkspi_loader.img conv=notrunc status=none + dd if=u-boot.itb of=rkspi_loader.img seek=768 conv=notrunc status=none + fi fi }