From cc7e03e0e4b8affb3a7fb55a4e02d7b8e4297b45 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Mon, 5 Oct 2020 21:22:57 +0200 Subject: [PATCH] Switched rock64 to mainline u-boot (#2151) --- config/sources/families/include/rockchip64_common.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index ad7d1d934e..fb615ef9b1 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -33,6 +33,11 @@ if [[ $BOARD == nanopi-r2s || $BOARD == rockpi-e || $BOARD == nanopineo3 || $BOA MINILOADER_BLOB='rk33/rk322xh_miniloader_v2.50.bin' BL31_BLOB='rk33/rk322xh_bl31_v1.42.elf' +elif [[ $BOARD == rock64 ]]; then + + BOOT_USE_MAINLINE_ATF=yes + BOOT_SOC=rk3328 + elif [[ $BOOTCONFIG == *3328* ]]; then BOOT_RK3328_USE_AYUFAN_ATF=yes @@ -102,7 +107,7 @@ prepare_boot_configuration() ATFDIR='arm-trusted-firmware' ATFBRANCH='tag:v2.2' ATF_USE_GCC='> 6.3' - ATF_TARGET_MAP='M0_CROSS_COMPILE=arm-linux-gnueabi- PLAT=rk3399 bl31;;build/rk3399/release/bl31/bl31.elf:bl31.bin' + ATF_TARGET_MAP="M0_CROSS_COMPILE=arm-linux-gnueabi- PLAT=$BOOT_SOC bl31;;build/$BOOT_SOC/release/bl31/bl31.elf:bl31.bin" ATF_TOOLCHAIN2="arm-linux-gnueabi-:> 5.0" elif [[ $BOOT_USE_TPL_SPL_BLOB == yes ]]; then