From da1cb09fc2b001328ae6f3c843365dddaae56158 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 8 Aug 2021 18:19:18 +0200 Subject: [PATCH] Bugfix - adjust sunxi u-boots While necesary revert to 2020.10 we need to exclude a few of. Now they all build OOB. --- config/sources/families/include/sunxi64_common.inc | 3 +++ config/sources/families/include/sunxi_common.inc | 3 +++ ...ole.patch => enable-nanopi-r1-uart1-console.patch.disabled} | 0 3 files changed, 6 insertions(+) rename patch/u-boot/u-boot-sunxi/{enable-nanopi-r1-uart1-console.patch => enable-nanopi-r1-uart1-console.patch.disabled} (100%) diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index bb89f3b847..e8b43acdb2 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -3,6 +3,9 @@ ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl31.bin" BOOTDELAY=1 ##https://armbian.atlassian.net/browse/AR-867 BOOTBRANCH='tag:v2020.10' + +[[ $BOARD == pineh64* ]] && BOOTBRANCH='tag:v2021.07' + BOOTPATCHDIR='u-boot-sunxi' BOOTENV_FILE='sunxi.txt' UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin' diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 4f0c7c903f..bda6a758e9 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -2,6 +2,9 @@ ARCH=armhf BOOTDELAY=1 ##https://armbian.atlassian.net/browse/AR-867 BOOTBRANCH='tag:v2020.10' + +[[ $LINUXFAMILY == sun8i-v3s ]] && BOOTBRANCH='tag:v2021.07' + BOOTPATCHDIR='u-boot-sunxi' UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin' BOOTSCRIPT="boot-sunxi.cmd:boot.cmd" diff --git a/patch/u-boot/u-boot-sunxi/enable-nanopi-r1-uart1-console.patch b/patch/u-boot/u-boot-sunxi/enable-nanopi-r1-uart1-console.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-sunxi/enable-nanopi-r1-uart1-console.patch rename to patch/u-boot/u-boot-sunxi/enable-nanopi-r1-uart1-console.patch.disabled