From 80d232ca20e160dcca1a499b46232d6869469c9b Mon Sep 17 00:00:00 2001
From: orangepi-xunlong <258384131@qq.com>
Date: Fri, 8 Apr 2022 20:07:16 +0800
Subject: [PATCH] sun50iw6: current: Bump u-boot to v2021.10

---
 external/config/sources/families/include/sunxi64_common.inc | 3 ++-
 external/config/sources/families/sun50iw6.conf              | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/external/config/sources/families/include/sunxi64_common.inc b/external/config/sources/families/include/sunxi64_common.inc
index f128968..64e649d 100644
--- a/external/config/sources/families/include/sunxi64_common.inc
+++ b/external/config/sources/families/include/sunxi64_common.inc
@@ -1,9 +1,10 @@
+enable_extension "sunxi-tools"
 ARCH=arm64
 ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl31.bin"
 BOOTDELAY=1
 BOOTPATCHDIR='u-boot-sunxi'
 BOOTENV_FILE='sunxi.txt'
-UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
+UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
 BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
 LINUXFAMILY=sunxi64
 PACKAGE_LIST_DESKTOP_FAMILY="fcitx fonts-wqy-zenhei"
diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf
index bef9a47..94dd205 100644
--- a/external/config/sources/families/sun50iw6.conf
+++ b/external/config/sources/families/sun50iw6.conf
@@ -37,10 +37,13 @@ case $BRANCH in
 		ASOUND_STATE='asound.state.sun50iw6-current'
 		KERNELBRANCH="branch:orange-pi-5.10"
 		LINUXCONFIG="linux-5.10-sunxi64-current"
+
 	;;
 
 	next)
 
+		BOOTBRANCH='branch:v2021.10-sunxi'
+
 		ASOUND_STATE='asound.state.sun50iw6-current'
 		KERNELBRANCH="branch:orange-pi-5.16-sunxi64"
 		LINUXCONFIG="linux-5.16-sunxi64-current"