Adjust remaining Allwinner u-boot patches due to u-boot upgrade to 2020.10

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

@@ -146,16 +146,16 @@ index 5638c4a..eec13fd 100644
 --- a/configs/orangepi_lite_defconfig
 +++ b/configs/orangepi_lite_defconfig
 @@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
- CONFIG_NR_DRAM_BANKS=1
  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_USE_PREBOOT=y
- # CONFIG_CMD_FLASH is not set
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_OHCI_HCD=y
 diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
 index 19c35ef103..80404ab377 100644
 --- a/configs/Orangepi_mini_defconfig
@@ -174,16 +174,16 @@ index 4fe81f8..5f50366 100644
 --- a/configs/orangepi_one_defconfig
 +++ b/configs/orangepi_one_defconfig
 @@ -3,7 +3,9 @@ CONFIG_ARCH_SUNXI=y
- CONFIG_NR_DRAM_BANKS=1
  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_USE_PREBOOT=y
- # CONFIG_CMD_FLASH is not set
+ CONFIG_SUN8I_EMAC=y
+ CONFIG_USB_EHCI_HCD=y
 diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
 index ba0f2d5..93641c3 100644
 --- a/configs/orangepi_pc2_defconfig
@@ -278,8 +278,8 @@ index 8a3561b..37f827a 100644
 +++ b/configs/a64-olinuxino_defconfig
 @@ -7,6 +7,8 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
  CONFIG_MMC_SUNXI_SLOT_EXTRA=2
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-olinuxino"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_DRAM_CLK=624
 +CONFIG_DRAM_ZQ=3881949
  CONFIG_SUN8I_EMAC=y

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

@@ -3,10 +3,10 @@ index ed30708f90..f87148c7e6 100644
 --- a/configs/nanopi_neo_defconfig
 +++ b/configs/nanopi_neo_defconfig
 @@ -9,5 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo"
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_CONSOLE_MUX=y
 +CONFIG_SYS_CLK_FREQ=480000000
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo"
  CONFIG_SUN8I_EMAC=y
  CONFIG_USB_EHCI_HCD=y
 diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
@@ -14,21 +14,22 @@ index 11eb3ab13b..d8f3f75192 100644
 --- a/configs/nanopi_neo_air_defconfig
 +++ b/configs/nanopi_neo_air_defconfig
 @@ -9,5 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
+ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_CONSOLE_MUX=y
 +CONFIG_SYS_CLK_FREQ=480000000
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air"
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_OHCI_HCD=y
+ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
 index f8dda05..739a5f4 100644
 --- a/configs/orangepi_zero_defconfig
 +++ b/configs/orangepi_zero_defconfig
 @@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUNXI=y
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_CONSOLE_MUX=y
  CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_SYS_CLK_FREQ=480000000
+ CONFIG_CONSOLE_MUX=y
  CONFIG_SUN8I_EMAC=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_OHCI_HCD=y

patch/u-boot/u-boot-sunxi/enable-ethernet-orangepiprime.patch

@@ -3,11 +3,11 @@ index 7e10ebe..8d13489 100644
 --- a/configs/orangepi_prime_defconfig
 +++ b/configs/orangepi_prime_defconfig
 @@ -10,6 +10,8 @@ CONFIG_NR_DRAM_BANKS=1
- # CONFIG_SPL_DOS_PARTITION is not set
- # CONFIG_SPL_EFI_PARTITION is not set
+ # CONFIG_DRAM_ODT_EN is not set
  CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_MACPWR="PD6"
 +CONFIG_SPL_SPI_SUNXI=y
  CONFIG_SUN8I_EMAC=y
  CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_MUSB_GADGET=y
+ CONFIG_USB_OHCI_HCD=y

patch/u-boot/u-boot-sunxi/xxx-disable-de2-to-improve-edid-detection.patch

@@ -124,8 +124,8 @@ index f95c7faf..cd5f43d1 100644
 +++ b/configs/bananapi_m2_zero_defconfig
 @@ -6,3 +6,4 @@ CONFIG_DRAM_CLK=408
  CONFIG_MMC0_CD_PIN=""
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
  CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero"
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 +CONFIG_VIDEO_DE2=n
 diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
 index 7f31cf00..221bea67 100644