OSDN > Pesquisar Software > ImmortalWrt > SCM > git > immortalwrt > Commit

ImmortalWrt
Fork
immortalwrt
packages
luci

R/O
HTTP
SSH
HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt

Commit MetaInfo

Revisão	145d896e0e68cef80880700060169cc004a7b46e (tree)
Hora	2022-01-24 05:20:53
Autor	Daniel Golle <daniel@makr...>
Commiter	Daniel Golle

Mensagem de Log

uboot-mediatek: update to version 2022.01

Tested on BananaPi R2 (SD, eMMC), BananaPi R64 (SD, eMMC, SPI-NAND) and
UniElec U7623-02 (eMMC).

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

Mudança Sumário

modified: package/boot/uboot-mediatek/Makefile (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-09-board-mediatek-add-more-network-configurations.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-14-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-16-env-add-support-for-generic-MTD-device.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-17-board-mt7629-add-support-for-booting-from-SPI-NAND.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-18-board-mt7622-use-new-spi-nand-driver.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-19-configs-mt7629-remove-unused-options-and-add-dm-comm.patch (diff)
modified: package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch (diff)
modified: package/boot/uboot-mediatek/patches/110-no-kwbimage.patch (diff)
modified: package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch (diff)
modified: package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch (diff)
modified: package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch (diff)
modified: package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch (diff)
modified: package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch (diff)
modified: package/boot/uboot-mediatek/patches/350-add-support-for-Winbond-W25Q512JV.patch (diff)
modified: package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch (diff)
modified: package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch (diff)
modified: package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch (diff)
modified: package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch (diff)
modified: package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch (diff)

Diff

--- a/package/boot/uboot-mediatek/Makefile

+++ b/package/boot/uboot-mediatek/Makefile

		@@ -1,8 +1,8 @@
1	1	include $(TOPDIR)/rules.mk
2	2	include $(INCLUDE_DIR)/kernel.mk
3	3
4		-PKG_VERSION:=2021.10
5		-PKG_HASH:=cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
	4	+PKG_VERSION:=2022.01
	5	+PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
6	6	PKG_BUILD_DEPENDS:=arm-trusted-firmware-tools/host
7	7
8	8	include $(INCLUDE_DIR)/u-boot.mk

--- a/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-01-Revert-clk-Add-debugging-for-return-values.patch

		@@ -10,7 +10,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
10	10
11	11	--- a/drivers/clk/clk-uclass.c
12	12	+++ b/drivers/clk/clk-uclass.c
13		-@@ -87,7 +87,7 @@ static int clk_get_by_index_tail(int ret
	13	+@@ -88,7 +88,7 @@ static int clk_get_by_index_tail(int ret
14	14	if (ret) {
15	15	debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
16	16	__func__, ret);

		@@ -19,7 +19,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
19	19	}
20	20
21	21	clk->dev = dev_clk;
22		-@@ -100,15 +100,14 @@ static int clk_get_by_index_tail(int ret
	22	+@@ -101,15 +101,14 @@ static int clk_get_by_index_tail(int ret
23	23	ret = clk_of_xlate_default(clk, args);
24	24	if (ret) {
25	25	debug("of_xlate() failed: %d\n", ret);

		@@ -37,7 +37,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
37	37	}
38	38
39	39	static int clk_get_by_indexed_prop(struct udevice dev, const char prop_name,
40		-@@ -127,7 +126,7 @@ static int clk_get_by_indexed_prop(struc
	40	+@@ -128,7 +127,7 @@ static int clk_get_by_indexed_prop(struc
41	41	if (ret) {
42	42	debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
43	43	__func__, ret);

		@@ -46,7 +46,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
46	46	}
47	47
48	48
49		-@@ -502,7 +501,6 @@ int clk_free(struct clk *clk)
	49	+@@ -501,7 +500,6 @@ int clk_free(struct clk *clk)
50	50	ulong clk_get_rate(struct clk *clk)
51	51	{
52	52	const struct clk_ops *ops;

		@@ -54,7 +54,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
54	54
55	55	debug("%s(clk=%p)\n", __func__, clk);
56	56	if (!clk_valid(clk))
57		-@@ -512,11 +510,7 @@ ulong clk_get_rate(struct clk *clk)
	57	+@@ -511,11 +509,7 @@ ulong clk_get_rate(struct clk *clk)
58	58	if (!ops->get_rate)
59	59	return -ENOSYS;
60	60

--- a/package/boot/uboot-mediatek/patches/000-mtk-09-board-mediatek-add-more-network-configurations.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-09-board-mediatek-add-more-network-configurations.patch

		@@ -14,7 +14,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
14	14
15	15	--- a/include/configs/mt7622.h
16	16	+++ b/include/configs/mt7622.h
17		-@@ -36,6 +36,7 @@
	17	+@@ -30,6 +30,7 @@
18	18
19	19	/* Ethernet */
20	20	#define CONFIG_IPADDR 192.168.1.1

		@@ -25,7 +25,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
25	25	#endif
26	26	--- a/include/configs/mt7623.h
27	27	+++ b/include/configs/mt7623.h
28		-@@ -54,6 +54,7 @@
	28	+@@ -45,6 +45,7 @@
29	29	/* Ethernet */
30	30	#define CONFIG_IPADDR 192.168.1.1
31	31	#define CONFIG_SERVERIP 192.168.1.2

		@@ -35,7 +35,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
35	35
36	36	--- a/include/configs/mt7629.h
37	37	+++ b/include/configs/mt7629.h
38		-@@ -52,5 +52,6 @@
	38	+@@ -45,5 +45,6 @@
39	39	/* Ethernet */
40	40	#define CONFIG_IPADDR 192.168.1.1
41	41	#define CONFIG_SERVERIP 192.168.1.2

--- a/package/boot/uboot-mediatek/patches/000-mtk-14-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-14-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch

		@@ -38,15 +38,15 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
38	38
39	39	--- a/drivers/mtd/Kconfig
40	40	+++ b/drivers/mtd/Kconfig
41		-@@ -109,6 +109,8 @@ config HBMC_AM654
42		- This is the driver for HyperBus controller on TI's AM65x and
43		- other SoCs
	41	+@@ -116,6 +116,8 @@ config STM32_FLASH
	42	+ This is the driver of embedded flash for some STMicroelectronics
	43	+ STM32 MCU.
44	44
45	45	+source "drivers/mtd/mtk-snand/Kconfig"
46	46	+
47	47	source "drivers/mtd/nand/Kconfig"
48	48
49		- source "drivers/mtd/spi/Kconfig"
	49	+ config SYS_NAND_MAX_CHIPS
50	50	--- a/drivers/mtd/Makefile
51	51	+++ b/drivers/mtd/Makefile
52	52	@@ -39,3 +39,5 @@ obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPOR

		@@ -1145,7 +1145,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
1145	1145	+}
1146	1146	--- /dev/null
1147	1147	+++ b/drivers/mtd/mtk-snand/mtk-snand-mtd.c
1148		-@@ -0,0 +1,526 @@
	1148	+@@ -0,0 +1,524 @@
1149	1149	+// SPDX-License-Identifier: GPL-2.0
1150	1150	+/*
1151	1151	+ * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.

		@@ -1225,9 +1225,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
1225	1225	+ else
1226	1226	+ instr->state = MTD_ERASE_DONE;
1227	1227	+
1228		-+ if (!ret)
1229		-+ mtd_erase_callback(instr);
1230		-+ else
	1228	++ if (ret)
1231	1229	+ ret = -EIO;
1232	1230	+
1233	1231	+ return ret;

--- a/package/boot/uboot-mediatek/patches/000-mtk-16-env-add-support-for-generic-MTD-device.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-16-env-add-support-for-generic-MTD-device.patch

		@@ -19,7 +19,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
19	19
20	20	--- a/cmd/nvedit.c
21	21	+++ b/cmd/nvedit.c
22		-@@ -50,6 +50,7 @@ DECLARE_GLOBAL_DATA_PTR;
	22	+@@ -48,6 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
23	23	defined(CONFIG_ENV_IS_IN_MMC) \|\| \
24	24	defined(CONFIG_ENV_IS_IN_FAT) \|\| \
25	25	defined(CONFIG_ENV_IS_IN_EXT4) \|\| \

		@@ -27,7 +27,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
27	27	defined(CONFIG_ENV_IS_IN_NAND) \|\| \
28	28	defined(CONFIG_ENV_IS_IN_NVRAM) \|\| \
29	29	defined(CONFIG_ENV_IS_IN_ONENAND) \|\| \
30		-@@ -64,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR;
	30	+@@ -62,7 +63,7 @@ DECLARE_GLOBAL_DATA_PTR;
31	31
32	32	#if !defined(ENV_IS_IN_DEVICE) && \
33	33	!defined(CONFIG_ENV_IS_NOWHERE)

		@@ -47,7 +47,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
47	47	help
48	48	Define this if you don't want to or can't have an environment stored
49	49	on a storage medium. In this case the environment will still exist
50		-@@ -207,6 +207,27 @@ config ENV_IS_IN_MMC
	50	+@@ -208,6 +208,27 @@ config ENV_IS_IN_MMC
51	51	This value is also in units of bytes, but must also be aligned to
52	52	an MMC sector boundary.
53	53

		@@ -75,7 +75,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
75	75	config ENV_IS_IN_NAND
76	76	bool "Environment in a NAND device"
77	77	depends on !CHAIN_OF_TRUST
78		-@@ -534,10 +555,16 @@ config ENV_ADDR_REDUND
	78	+@@ -535,10 +556,16 @@ config ENV_ADDR_REDUND
79	79	Offset from the start of the device (or partition) of the redundant
80	80	environment location.
81	81

		@@ -93,7 +93,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
93	93	default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
94	94	default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
95	95	default 0x88000 if ARCH_SUNXI
96		-@@ -582,6 +609,12 @@ config ENV_SECT_SIZE
	96	+@@ -583,6 +610,12 @@ config ENV_SECT_SIZE
97	97	help
98	98	Size of the sector containing the environment.
99	99

		@@ -389,7 +389,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
389	389	+};
390	390	--- a/include/env_internal.h
391	391	+++ b/include/env_internal.h
392		-@@ -131,6 +131,7 @@ enum env_location {
	392	+@@ -130,6 +130,7 @@ enum env_location {
393	393	ENVL_FAT,
394	394	ENVL_FLASH,
395	395	ENVL_MMC,

--- a/package/boot/uboot-mediatek/patches/000-mtk-17-board-mt7629-add-support-for-booting-from-SPI-NAND.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-17-board-mt7629-add-support-for-booting-from-SPI-NAND.patch

		@@ -85,49 +85,6 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
85	85	snor: snor@11014000 {
86	86	compatible = "mediatek,mtk-snor";
87	87	reg = <0x11014000 0x1000>;
88		---- a/board/mediatek/mt7629/Kconfig
89		-+++ b/board/mediatek/mt7629/Kconfig
90		-@@ -12,6 +12,39 @@ config MTK_SPL_PAD_SIZE
91		-
92		- config MTK_BROM_HEADER_INFO
93		- string
94		-- default "media=nor"
95		-+ default "media=nor" if BOOT_FROM_SNOR
96		-+ default "media=snand;nandinfo=2k+64" if BOOT_FROM_SNAND_2K_64
97		-+ default "media=snand;nandinfo=2k+128" if BOOT_FROM_SNAND_2K_128
98		-+ default "media=snand;nandinfo=4k+128" if BOOT_FROM_SNAND_4K_128
99		-+ default "media=snand;nandinfo=4k+256" if BOOT_FROM_SNAND_4K_256
100		-+
101		-+choice
102		-+ prompt "Boot device"
103		-+ default BOOT_FROM_SNOR
104		-+
105		-+config BOOT_FROM_SNOR
106		-+ bool "SPI-NOR"
107		-+
108		-+config BOOT_FROM_SNAND_2K_64
109		-+ bool "SPI-NAND (2K+64)"
110		-+ select MT7629_BOOT_FROM_SNAND
111		-+
112		-+config BOOT_FROM_SNAND_2K_128
113		-+ bool "SPI-NAND (2K+128)"
114		-+ select MT7629_BOOT_FROM_SNAND
115		-+
116		-+config BOOT_FROM_SNAND_4K_128
117		-+ bool "SPI-NAND (4K+128)"
118		-+ select MT7629_BOOT_FROM_SNAND
119		-+
120		-+config BOOT_FROM_SNAND_4K_256
121		-+ bool "SPI-NAND (4K+256)"
122		-+ select MT7629_BOOT_FROM_SNAND
123		-+
124		-+endchoice
125		-+
126		-+config MT7629_BOOT_FROM_SNAND
127		-+ bool
128		-+ default n
129		-
130		- endif
131	88	--- /dev/null
132	89	+++ b/configs/mt7629_nand_rfb_defconfig
133	90	@@ -0,0 +1,111 @@

		@@ -244,7 +201,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
244	201	+# CONFIG_EFI_LOADER is not set
245	202	--- a/include/configs/mt7629.h
246	203	+++ b/include/configs/mt7629.h
247		-@@ -30,12 +30,19 @@
	204	+@@ -25,12 +25,19 @@
248	205
249	206	/* Defines for SPL */
250	207	#define CONFIG_SPL_STACK 0x106000

--- a/package/boot/uboot-mediatek/patches/000-mtk-18-board-mt7622-use-new-spi-nand-driver.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-18-board-mt7622-use-new-spi-nand-driver.patch

		@@ -55,7 +55,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
55	55	reg = <0x11014000 0x1000>;
56	56	--- a/configs/mt7622_rfb_defconfig
57	57	+++ b/configs/mt7622_rfb_defconfig
58		-@@ -15,6 +15,7 @@ CONFIG_LOG=y
	58	+@@ -16,6 +16,7 @@ CONFIG_LOG=y
59	59	CONFIG_SYS_PROMPT="MT7622> "
60	60	CONFIG_CMD_BOOTMENU=y
61	61	CONFIG_CMD_MMC=y

		@@ -63,7 +63,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
63	63	CONFIG_CMD_PCI=y
64	64	CONFIG_CMD_SF_TEST=y
65	65	CONFIG_CMD_PING=y
66		-@@ -27,6 +28,10 @@ CONFIG_SYSCON=y
	66	+@@ -28,6 +29,10 @@ CONFIG_SYSCON=y
67	67	CONFIG_CLK=y
68	68	CONFIG_MMC_HS200_SUPPORT=y
69	69	CONFIG_MMC_MTK=y

--- a/package/boot/uboot-mediatek/patches/000-mtk-19-configs-mt7629-remove-unused-options-and-add-dm-comm.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-19-configs-mt7629-remove-unused-options-and-add-dm-comm.patch

		@@ -14,7 +14,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
14	14
15	15	--- a/configs/mt7629_rfb_defconfig
16	16	+++ b/configs/mt7629_rfb_defconfig
17		-@@ -28,9 +28,14 @@ CONFIG_SPL_WATCHDOG=y
	17	+@@ -29,9 +29,14 @@ CONFIG_SPL_WATCHDOG=y
18	18	CONFIG_HUSH_PARSER=y
19	19	CONFIG_SYS_PROMPT="U-Boot> "
20	20	CONFIG_CMD_BOOTMENU=y

--- a/package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch

+++ b/package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch

		@@ -21,7 +21,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
21	21	CONFIG_DEBUG_UART_BASE=0x11002000
22	22	CONFIG_DEBUG_UART_CLOCK=25000000
23	23	CONFIG_DEBUG_UART=y
24		-@@ -21,6 +23,9 @@ CONFIG_CMD_SF_TEST=y
	24	+@@ -22,6 +24,9 @@ CONFIG_CMD_SF_TEST=y
25	25	CONFIG_CMD_PING=y
26	26	CONFIG_CMD_SMC=y
27	27	CONFIG_ENV_OVERWRITE=y

--- a/package/boot/uboot-mediatek/patches/110-no-kwbimage.patch

+++ b/package/boot/uboot-mediatek/patches/110-no-kwbimage.patch

		@@ -1,6 +1,6 @@
1	1	--- a/tools/Makefile
2	2	+++ b/tools/Makefile
3		-@@ -118,7 +118,6 @@ dumpimage-mkimage-objs := aisimage.o \
	3	+@@ -119,7 +119,6 @@ dumpimage-mkimage-objs := aisimage.o \
4	4	imximage.o \
5	5	imx8image.o \
6	6	imx8mimage.o \

--- a/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch

+++ b/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch

		@@ -1,6 +1,6 @@
1	1	--- a/Makefile
2	2	+++ b/Makefile
3		-@@ -1051,7 +1051,7 @@ quiet_cmd_pad_cat = CAT $@
	3	+@@ -1045,7 +1045,7 @@ quiet_cmd_pad_cat = CAT $@
4	4	cmd_pad_cat = $(cmd_objcopy) && $(append) \|\| { rm -f $@; false; }
5	5
6	6	quiet_cmd_lzma = LZMA $@

--- a/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch

+++ b/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch

		@@ -66,9 +66,9 @@
66	66	static int do_iminfo(struct cmd_tbl *cmdtp, int flag, int argc,
67	67	char *const argv[])
68	68	{
69		---- a/common/image-fit.c
70		-+++ b/common/image-fit.c
71		-@@ -1962,6 +1962,51 @@ static const char *fit_get_image_type_pr
	69	+--- a/boot/image-fit.c
	70	++++ b/boot/image-fit.c
	71	+@@ -1993,6 +1993,51 @@ static const char *fit_get_image_type_pr
72	72	return "unknown";
73	73	}
74	74

		@@ -122,7 +122,7 @@
122	122	int arch, int image_type, int bootstage_id,
123	123	--- a/include/image.h
124	124	+++ b/include/image.h
125		-@@ -996,6 +996,7 @@ int fit_parse_subimage(const char *spec,
	125	+@@ -952,6 +952,7 @@ int fit_parse_subimage(const char *spec,
126	126	ulong addr, const char *image_name);
127	127
128	128	int fit_get_subimage_count(const void *fit, int images_noffset);

--- a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch

+++ b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch

		@@ -1,6 +1,6 @@
1	1	--- a/cmd/Kconfig
2	2	+++ b/cmd/Kconfig
3		-@@ -484,6 +484,12 @@ config CMD_ENV_EXISTS
	3	+@@ -483,6 +483,12 @@ config CMD_ENV_EXISTS
4	4	Check if a variable is defined in the environment for use in
5	5	shell scripting.
6	6

		@@ -15,7 +15,7 @@
15	15	help
16	16	--- a/cmd/nvedit.c
17	17	+++ b/cmd/nvedit.c
18		-@@ -473,6 +473,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in
	18	+@@ -408,6 +408,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in
19	19	}
20	20	#endif
21	21

		@@ -76,7 +76,7 @@
76	76	#if defined(CONFIG_CMD_ENV_CALLBACK)
77	77	static int print_static_binding(const char var_name, const char callback_name,
78	78	void *priv)
79		-@@ -1377,6 +1431,9 @@ static struct cmd_tbl cmd_env_sub[] = {
	79	+@@ -1189,6 +1243,9 @@ static struct cmd_tbl cmd_env_sub[] = {
80	80	U_BOOT_CMD_MKENT(load, 1, 0, do_env_load, "", ""),
81	81	#endif
82	82	U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""),

		@@ -86,7 +86,7 @@
86	86	#if defined(CONFIG_CMD_RUN)
87	87	U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""),
88	88	#endif
89		-@@ -1465,6 +1522,9 @@ static char env_help_text[] =
	89	+@@ -1277,6 +1334,9 @@ static char env_help_text[] =
90	90	#if defined(CONFIG_CMD_NVEDIT_EFI)
91	91	"env print -e [-guid guid] [-n] [name ...] - print UEFI environment\n"
92	92	#endif

		@@ -96,7 +96,7 @@
96	96	#if defined(CONFIG_CMD_RUN)
97	97	"env run var [...] - run commands in an environment variable\n"
98	98	#endif
99		-@@ -1574,6 +1634,17 @@ U_BOOT_CMD(
	99	+@@ -1386,6 +1446,17 @@ U_BOOT_CMD(
100	100	);
101	101	#endif
102	102

--- a/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch

+++ b/package/boot/uboot-mediatek/patches/300-mt7622-generic-reset-button-ignore-env.patch

		@@ -38,11 +38,11 @@
38	38	env_relocate();
39	39	return 0;
40	40	}
41		---- a/board/mediatek/mt7622/Kconfig
42		-+++ b/board/mediatek/mt7622/Kconfig
43		-@@ -14,4 +14,8 @@ config MTK_BROM_HEADER_INFO
44		- string
45		- default "media=nor"
	41	+--- a/arch/arm/mach-mediatek/Kconfig
	42	++++ b/arch/arm/mach-mediatek/Kconfig
	43	+@@ -115,4 +115,8 @@ config MTK_BROM_HEADER_INFO
	44	+ default "media=emmc" if TARGET_MT8516 \|\| TARGET_MT8365 \|\| TARGET_MT8183
	45	+ default "lk=1" if TARGET_MT7623
46	46
47	47	+config RESET_BUTTON_LABEL
48	48	+ string "Button to trigger factory reset"

--- a/package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch

+++ b/package/boot/uboot-mediatek/patches/301-mt7623-generic-reset-button-ignore-env.patch

		@@ -1,14 +1,3 @@
1		---- a/board/mediatek/mt7623/Kconfig
2		-+++ b/board/mediatek/mt7623/Kconfig
3		-@@ -10,4 +10,8 @@ config MTK_BROM_HEADER_INFO
4		- string
5		- default "lk=1"
6		-
7		-+config RESET_BUTTON_LABEL
8		-+ string "Button to trigger factory reset"
9		-+ default "reset"
10		-+
11		- endif
12	1	--- a/board/mediatek/mt7623/mt7623_rfb.c
13	2	+++ b/board/mediatek/mt7623/mt7623_rfb.c
14	3	@@ -4,8 +4,17 @@

--- a/package/boot/uboot-mediatek/patches/350-add-support-for-Winbond-W25Q512JV.patch

+++ b/package/boot/uboot-mediatek/patches/350-add-support-for-Winbond-W25Q512JV.patch

		@@ -1,6 +1,6 @@
1	1	--- a/drivers/mtd/spi/spi-nor-ids.c
2	2	+++ b/drivers/mtd/spi/spi-nor-ids.c
3		-@@ -353,6 +353,8 @@ const struct flash_info spi_nor_ids[] =
	3	+@@ -369,6 +369,8 @@ const struct flash_info spi_nor_ids[] =
4	4	SPI_NOR_HAS_LOCK \| SPI_NOR_HAS_TB)
5	5	},
6	6	{ INFO("w25q256", 0xef4019, 0, 64 * 1024, 512, SECT_4K \| SPI_NOR_DUAL_READ \| SPI_NOR_QUAD_READ) },

--- a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch

+++ b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch

		@@ -1,6 +1,6 @@
1	1	--- a/configs/mt7623n_bpir2_defconfig
2	2	+++ b/configs/mt7623n_bpir2_defconfig
3		-@@ -4,52 +4,137 @@ CONFIG_ARCH_MEDIATEK=y
	3	+@@ -4,53 +4,138 @@ CONFIG_ARCH_MEDIATEK=y
4	4	CONFIG_SYS_TEXT_BASE=0x81e00000
5	5	CONFIG_SYS_MALLOC_F_LEN=0x4000
6	6	CONFIG_NR_DRAM_BANKS=1

		@@ -12,6 +12,7 @@
12	12	+CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2"
13	13	+CONFIG_USE_DEFAULT_ENV_FILE=y
14	14	CONFIG_DISTRO_DEFAULTS=y
	15	+ CONFIG_SYS_LOAD_ADDR=0x84000000
15	16	CONFIG_FIT=y
16	17	-CONFIG_FIT_VERBOSE=y
17	18	+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y

--- a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch

+++ b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch

		@@ -1,6 +1,6 @@
1	1	--- a/configs/mt7623a_unielec_u7623_02_defconfig
2	2	+++ b/configs/mt7623a_unielec_u7623_02_defconfig
3		-@@ -4,50 +4,134 @@ CONFIG_ARCH_MEDIATEK=y
	3	+@@ -4,51 +4,135 @@ CONFIG_ARCH_MEDIATEK=y
4	4	CONFIG_SYS_TEXT_BASE=0x81e00000
5	5	CONFIG_SYS_MALLOC_F_LEN=0x4000
6	6	CONFIG_NR_DRAM_BANKS=1

		@@ -11,6 +11,7 @@
11	11	+CONFIG_USE_DEFAULT_ENV_FILE=y
12	12	CONFIG_TARGET_MT7623=y
13	13	CONFIG_DISTRO_DEFAULTS=y
	14	+ CONFIG_SYS_LOAD_ADDR=0x84000000
14	15	CONFIG_FIT=y
15	16	-CONFIG_FIT_VERBOSE=y
16	17	+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y

--- a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch

+++ b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch

		@@ -1,12 +1,13 @@
1	1	--- /dev/null
2	2	+++ b/configs/mt7622_bananapi_bpi-r64-sdmmc_defconfig
3		-@@ -0,0 +1,158 @@
	3	+@@ -0,0 +1,159 @@
4	4	+CONFIG_ARM=y
5	5	+CONFIG_POSITION_INDEPENDENT=y
6	6	+CONFIG_ARCH_MEDIATEK=y
7	7	+CONFIG_TARGET_MT7622=y
8	8	+CONFIG_SYS_TEXT_BASE=0x41e00000
9	9	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	10	++CONFIG_SYS_LOAD_ADDR=0x40080000
10	11	+CONFIG_USE_DEFAULT_ENV_FILE=y
11	12	+CONFIG_BOARD_LATE_INIT=y
12	13	+CONFIG_BOOTP_SEND_HOSTNAME=y

		@@ -246,13 +247,14 @@
246	247	+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
247	248	--- /dev/null
248	249	+++ b/configs/mt7622_bananapi_bpi-r64-emmc_defconfig
249		-@@ -0,0 +1,145 @@
	250	+@@ -0,0 +1,146 @@
250	251	+CONFIG_ARM=y
251	252	+CONFIG_POSITION_INDEPENDENT=y
252	253	+CONFIG_ARCH_MEDIATEK=y
253	254	+CONFIG_TARGET_MT7622=y
254	255	+CONFIG_SYS_TEXT_BASE=0x41e00000
255	256	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	257	++CONFIG_SYS_LOAD_ADDR=0x40080000
256	258	+CONFIG_USE_DEFAULT_ENV_FILE=y
257	259	+CONFIG_BOARD_LATE_INIT=y
258	260	+CONFIG_BOOTP_SEND_HOSTNAME=y

		@@ -453,12 +455,13 @@
453	455	+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
454	456	--- /dev/null
455	457	+++ b/configs/mt7622_bananapi_bpi-r64-snand_defconfig
456		-@@ -0,0 +1,139 @@
	458	+@@ -0,0 +1,140 @@
457	459	+CONFIG_ARM=y
458	460	+CONFIG_POSITION_INDEPENDENT=y
459	461	+CONFIG_ARCH_MEDIATEK=y
460	462	+CONFIG_SYS_TEXT_BASE=0x41e00000
461	463	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	464	++CONFIG_SYS_LOAD_ADDR=0x40080000
462	465	+CONFIG_USE_DEFAULT_ENV_FILE=y
463	466	+CONFIG_BOARD_LATE_INIT=y
464	467	+CONFIG_BOOTP_SEND_HOSTNAME=y

--- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch

+++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch

		@@ -1,12 +1,13 @@
1	1	--- /dev/null
2	2	+++ b/configs/mt7622_linksys_e8450_defconfig
3		-@@ -0,0 +1,135 @@
	3	+@@ -0,0 +1,136 @@
4	4	+CONFIG_ARM=y
5	5	+CONFIG_POSITION_INDEPENDENT=y
6	6	+CONFIG_ARCH_MEDIATEK=y
7	7	+CONFIG_TARGET_MT7622=y
8	8	+CONFIG_SYS_TEXT_BASE=0x41e00000
9	9	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	10	++CONFIG_SYS_LOAD_ADDR=0x40080000
10	11	+CONFIG_USE_DEFAULT_ENV_FILE=y
11	12	+CONFIG_BOARD_LATE_INIT=y
12	13	+CONFIG_BOOTP_SEND_HOSTNAME=y

		@@ -336,7 +337,7 @@
336	337	+};
337	338	--- a/arch/arm/dts/Makefile
338	339	+++ b/arch/arm/dts/Makefile
339		-@@ -1104,6 +1104,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
	340	+@@ -1133,6 +1133,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
340	341	mt7622-rfb.dtb \
341	342	mt7623a-unielec-u7623-02-emmc.dtb \
342	343	mt7622-bananapi-bpi-r64.dtb \

--- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch

+++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch

		@@ -1,12 +1,13 @@
1	1	--- /dev/null
2	2	+++ b/configs/mt7622_ubnt_unifi-6-lr_defconfig
3		-@@ -0,0 +1,140 @@
	3	+@@ -0,0 +1,141 @@
4	4	+CONFIG_ARM=y
5	5	+CONFIG_POSITION_INDEPENDENT=y
6	6	+CONFIG_ARCH_MEDIATEK=y
7	7	+CONFIG_TARGET_MT7622=y
8	8	+CONFIG_SYS_TEXT_BASE=0x41e00000
9	9	+CONFIG_SYS_MALLOC_F_LEN=0x4000
	10	++CONFIG_SYS_LOAD_ADDR=0x40080000
10	11	+CONFIG_USE_DEFAULT_ENV_FILE=y
11	12	+CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)"
12	13	+CONFIG_ENV_IS_IN_MTD=y

		@@ -348,7 +349,7 @@
348	349	+};
349	350	--- a/arch/arm/dts/Makefile
350	351	+++ b/arch/arm/dts/Makefile
351		-@@ -1105,6 +1105,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
	352	+@@ -1134,6 +1134,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
352	353	mt7623a-unielec-u7623-02-emmc.dtb \
353	354	mt7622-bananapi-bpi-r64.dtb \
354	355	mt7622-linksys-e8450-ubi.dtb \

		@@ -411,7 +412,7 @@
411	412	+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
412	413	--- a/common/board_r.c
413	414	+++ b/common/board_r.c
414		-@@ -77,6 +77,7 @@
	415	+@@ -78,6 +78,7 @@
415	416	#ifdef CONFIG_EFI_SETUP_EARLY
416	417	#include <efi_loader.h>
417	418	#endif

		@@ -419,7 +420,7 @@
419	420
420	421	DECLARE_GLOBAL_DATA_PTR;
421	422
422		-@@ -416,6 +417,21 @@ static int initr_onenand(void)
	423	+@@ -417,6 +418,21 @@ static int initr_onenand(void)
423	424	}
424	425	#endif
425	426

Show on old repository browser