uboot-mediatek: update to 2021.10

U-Boot 2021.10 has been released.
Rebase mediatek patches on top of new release and remove some patches
which have been merged upstream.

Tested on Bananapi BPi-R2 (mt7623), Bananapi BPi-R64 (mt7622) and
Linksys E8450 (mt7622).

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 0 insertions, 94 deletions

diff --git a/package/boot/uboot-mediatek/patches/000-mtk-12-board-mt7629-enable-compression-of-u-boot-to-reduce-.patch b/package/boot/uboot-mediatek/patches/000-mtk-12-board-mt7629-enable-compression-of-u-boot-to-reduce-.patch
deleted file mode 100644
index c0dfad03c4..0000000000
--- a/package/boot/uboot-mediatek/patches/000-mtk-12-board-mt7629-enable-compression-of-u-boot-to-reduce-.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From a80ef99cb308904b82662deb66c5ed7a6ff59928 Mon Sep 17 00:00:00 2001
-From: Weijie Gao <weijie.gao@mediatek.com>
-Date: Wed, 3 Mar 2021 11:13:36 +0800
-Subject: [PATCH 12/21] board: mt7629: enable compression of u-boot to reduce
- the size of final image
-
-This patch makes use of the decompression mechanism implemented for mt7628
-previously to reduce the total image size. Binman will be also removed.
-
-Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
----
- Makefile                            |  3 +++
- arch/arm/dts/mt7629-rfb-u-boot.dtsi | 18 ------------------
- arch/arm/mach-mediatek/Kconfig      |  1 -
- configs/mt7629_rfb_defconfig        |  6 ++++++
- 4 files changed, 9 insertions(+), 19 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1666,6 +1666,9 @@ u-boot-elf.lds: arch/u-boot-elf.lds prep
- 
- ifeq ($(CONFIG_SPL),y)
- spl/u-boot-spl-mtk.bin: spl/u-boot-spl
-+
-+u-boot-mtk.bin: u-boot-with-spl.bin
-+	$(call if_changed,copy)
- else
- MKIMAGEFLAGS_u-boot-mtk.bin = -T mtk_image \
- 	-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \
---- a/arch/arm/dts/mt7629-rfb-u-boot.dtsi
-+++ b/arch/arm/dts/mt7629-rfb-u-boot.dtsi
-@@ -5,24 +5,6 @@
-  * Author: Weijie Gao <weijie.gao@mediatek.com>
-  */
- 
--#include <config.h>
--/ {
--	binman {
--		filename = "u-boot-mtk.bin";
--		pad-byte = <0xff>;
--
--#ifdef CONFIG_SPL
--		blob {
--			filename = "spl/u-boot-spl-mtk.bin";
--			size = <CONFIG_SPL_PAD_TO>;
--		};
--
--		u-boot-img {
--		};
--#endif
--	};
--};
--
- &infracfg {
- 	u-boot,dm-pre-reloc;
- };
---- a/arch/arm/mach-mediatek/Kconfig
-+++ b/arch/arm/mach-mediatek/Kconfig
-@@ -36,7 +36,6 @@ config TARGET_MT7629
- 	bool "MediaTek MT7629 SoC"
- 	select CPU_V7A
- 	select SPL
--	select BINMAN
- 	help
- 	  The MediaTek MT7629 is a ARM-based SoC with a dual-core Cortex-A7
- 	  including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet,
---- a/configs/mt7629_rfb_defconfig
-+++ b/configs/mt7629_rfb_defconfig
-@@ -10,7 +10,11 @@ CONFIG_SPL_TEXT_BASE=0x201000
- CONFIG_TARGET_MT7629=y
- CONFIG_SPL_SERIAL_SUPPORT=y
- CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
-+CONFIG_SPL_STACK_R_ADDR=0x40800000
-+CONFIG_SPL_PAYLOAD="u-boot-lzma.img"
-+CONFIG_BUILD_TARGET="u-boot-mtk.bin"
- CONFIG_DEFAULT_DEVICE_TREE="mt7629-rfb"
-+CONFIG_SPL_IMAGE="spl/u-boot-spl-mtk.bin"
- CONFIG_FIT=y
- CONFIG_FIT_VERBOSE=y
- CONFIG_BOOTDELAY=3
-@@ -18,6 +22,7 @@ CONFIG_DEFAULT_FDT_FILE="mt7629-rfb"
- CONFIG_SYS_CONSOLE_IS_IN_ENV=y
- # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-+CONFIG_SPL_STACK_R=y
- CONFIG_SPL_NOR_SUPPORT=y
- CONFIG_SPL_WATCHDOG_SUPPORT=y
- CONFIG_HUSH_PARSER=y
-@@ -87,4 +92,5 @@ CONFIG_USB_STORAGE=y
- CONFIG_USB_KEYBOARD=y
- CONFIG_WDT_MTK=y
- CONFIG_LZMA=y
-+CONFIG_SPL_LZMA=y
- # CONFIG_EFI_LOADER is not set