allwinner: update u-boot to 2021.07 (#3143)

* Bugfix - Bananapi PRO seems to work fine with latest u-boot

Done many reboots and it didn't break. The same has to be tested with other A20 boards

* Set Allwinner 32bit hw to most recent u-boot 2021.07

* Let's move all to 2021.07 and test ...

config/sources/arm64.conf

@@ -41,7 +41,7 @@ fi
 [[ -z $UBOOT_USE_GCC ]]	&& UBOOT_USE_GCC='> 8.0'
 [[ -z $BOOTSOURCE ]]		&& BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 [[ -z $BOOTDIR ]]		&& BOOTDIR=$MAINLINE_UBOOT_DIR
-[[ -z $BOOTBRANCH ]]		&& BOOTBRANCH='tag:v2020.04'
+[[ -z $BOOTBRANCH ]]		&& BOOTBRANCH='tag:v2021.07'
 
 [[ -z $KERNELDIR ]]		&& KERNELDIR=$MAINLINE_KERNEL_DIR
 [[ -z $KERNELSOURCE ]]		&& KERNELSOURCE=$MAINLINE_KERNEL_SOURCE

config/sources/families/include/sunxi64_common.inc

@@ -1,10 +1,6 @@
 ARCH=arm64
 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'

config/sources/families/include/sunxi_common.inc

@@ -1,10 +1,5 @@
 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"

config/sources/families/sun50iw9.conf

@@ -43,7 +43,6 @@ case $BRANCH in
 			ATFBRANCH='branch:master'
 			ATF_PLAT="sun50i_h616";
 			ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
-			BOOTBRANCH='branch:v2021.07'
 			LINUXCONFIG='linux-sunxi64-edge'
 
 	;;

patch/u-boot/u-boot-sunxi/adjust-default-dram-clockspeeds.patch

@@ -159,13 +159,13 @@ index 5638c4a..eec13fd 100644
 --- a/configs/orangepi_lite_defconfig
 +++ b/configs/orangepi_lite_defconfig
 @@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite"
  CONFIG_SPL=y
  CONFIG_MACH_SUN8I_H3=y
 -CONFIG_DRAM_CLK=672
 +CONFIG_DRAM_CLK=624
 +CONFIG_DRAM_ZQ=3881979
 +CONFIG_DRAM_ODT_EN=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_OHCI_HCD=y
@@ -187,13 +187,13 @@ index 4fe81f8..5f50366 100644
 --- a/configs/orangepi_one_defconfig
 +++ b/configs/orangepi_one_defconfig
 @@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
  CONFIG_SPL=y
  CONFIG_MACH_SUN8I_H3=y
 -CONFIG_DRAM_CLK=672
 +CONFIG_DRAM_CLK=624
 +CONFIG_DRAM_ZQ=3881979
 +CONFIG_DRAM_ODT_EN=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_SUN8I_EMAC=y
  CONFIG_USB_EHCI_HCD=y

patch/u-boot/u-boot-sunxi/adjust-small-boards-cpufreq.patch

@@ -26,7 +26,7 @@ index f8dda05..739a5f4 100644
 --- a/configs/orangepi_zero_defconfig
 +++ b/configs/orangepi_zero_defconfig
 @@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUNXI=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
+ CONFIG_SPL_SPI_SUNXI=y
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_SYS_CLK_FREQ=480000000
  CONFIG_CONSOLE_MUX=y

patch/u-boot/u-boot-sunxi/branch_default/do-not-relocate-initrd.patch

@@ -1,27 +0,0 @@
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index 64a190059a..bbec551cac 100644
---- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -503,6 +503,12 @@ extern int soft_i2c_gpio_scl;
- #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
- #endif
- 
-+#ifdef CONFIG_MACH_SUN8I_H3
-+#define INITRD_HIGH_ENV "initrd_high=0xFFFFFFFF\0"
-+#else
-+#define INITRD_HIGH_ENV
-+#endif
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	CONSOLE_ENV_SETTINGS \
- 	MEM_LAYOUT_ENV_SETTINGS \
-@@ -512,7 +518,8 @@ extern int soft_i2c_gpio_scl;
- 	SUNXI_MTDIDS_DEFAULT \
- 	SUNXI_MTDPARTS_DEFAULT \
- 	BOOTCMD_SUNXI_COMPAT \
--	BOOTENV
-+	BOOTENV \
-+	INITRD_HIGH_ENV
- 
- #else /* ifndef CONFIG_SPL_BUILD */
- #define CONFIG_EXTRA_ENV_SETTINGS

patch/u-boot/u-boot-sunxi/branch_default/enable-old-kernel-compat.patch

@@ -1,13 +0,0 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 513a35fc4e..77bc949cb7 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -623,7 +623,8 @@ config ARCH_SOCFPGA
-
- config ARCH_SUNXI
- 	bool "Support sunxi (Allwinner) SoCs"
- 	select BINMAN
-+	select OLD_SUNXI_KERNEL_COMPAT
- 	select CMD_GPIO
- 	select CMD_MMC if MMC
- 	select CMD_USB if DISTRO_DEFAULTS