• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

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


Commit MetaInfo

Revisão145d896e0e68cef80880700060169cc004a7b46e (tree)
Hora2022-01-24 05:20:53
AutorDaniel Golle <daniel@makr...>
CommiterDaniel 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

Diff

--- a/package/boot/uboot-mediatek/Makefile
+++ b/package/boot/uboot-mediatek/Makefile
@@ -1,8 +1,8 @@
11 include $(TOPDIR)/rules.mk
22 include $(INCLUDE_DIR)/kernel.mk
33
4-PKG_VERSION:=2021.10
5-PKG_HASH:=cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
4+PKG_VERSION:=2022.01
5+PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
66 PKG_BUILD_DEPENDS:=arm-trusted-firmware-tools/host
77
88 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.
1010
1111 --- a/drivers/clk/clk-uclass.c
1212 +++ 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
1414 if (ret) {
1515 debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
1616 __func__, ret);
@@ -19,7 +19,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
1919 }
2020
2121 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
2323 ret = clk_of_xlate_default(clk, args);
2424 if (ret) {
2525 debug("of_xlate() failed: %d\n", ret);
@@ -37,7 +37,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
3737 }
3838
3939 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
4141 if (ret) {
4242 debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
4343 __func__, ret);
@@ -46,7 +46,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
4646 }
4747
4848
49-@@ -502,7 +501,6 @@ int clk_free(struct clk *clk)
49+@@ -501,7 +500,6 @@ int clk_free(struct clk *clk)
5050 ulong clk_get_rate(struct clk *clk)
5151 {
5252 const struct clk_ops *ops;
@@ -54,7 +54,7 @@ This reverts commit 5c5992cb90cf9ca4d51e38d9a95a13c293904df5.
5454
5555 debug("%s(clk=%p)\n", __func__, clk);
5656 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)
5858 if (!ops->get_rate)
5959 return -ENOSYS;
6060
--- 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>
1414
1515 --- a/include/configs/mt7622.h
1616 +++ b/include/configs/mt7622.h
17-@@ -36,6 +36,7 @@
17+@@ -30,6 +30,7 @@
1818
1919 /* Ethernet */
2020 #define CONFIG_IPADDR 192.168.1.1
@@ -25,7 +25,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
2525 #endif
2626 --- a/include/configs/mt7623.h
2727 +++ b/include/configs/mt7623.h
28-@@ -54,6 +54,7 @@
28+@@ -45,6 +45,7 @@
2929 /* Ethernet */
3030 #define CONFIG_IPADDR 192.168.1.1
3131 #define CONFIG_SERVERIP 192.168.1.2
@@ -35,7 +35,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
3535
3636 --- a/include/configs/mt7629.h
3737 +++ b/include/configs/mt7629.h
38-@@ -52,5 +52,6 @@
38+@@ -45,5 +45,6 @@
3939 /* Ethernet */
4040 #define CONFIG_IPADDR 192.168.1.1
4141 #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>
3838
3939 --- a/drivers/mtd/Kconfig
4040 +++ 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.
4444
4545 +source "drivers/mtd/mtk-snand/Kconfig"
4646 +
4747 source "drivers/mtd/nand/Kconfig"
4848
49- source "drivers/mtd/spi/Kconfig"
49+ config SYS_NAND_MAX_CHIPS
5050 --- a/drivers/mtd/Makefile
5151 +++ b/drivers/mtd/Makefile
5252 @@ -39,3 +39,5 @@ obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPOR
@@ -1145,7 +1145,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
11451145 +}
11461146 --- /dev/null
11471147 +++ b/drivers/mtd/mtk-snand/mtk-snand-mtd.c
1148-@@ -0,0 +1,526 @@
1148+@@ -0,0 +1,524 @@
11491149 +// SPDX-License-Identifier: GPL-2.0
11501150 +/*
11511151 + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
@@ -1225,9 +1225,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
12251225 + else
12261226 + instr->state = MTD_ERASE_DONE;
12271227 +
1228-+ if (!ret)
1229-+ mtd_erase_callback(instr);
1230-+ else
1228++ if (ret)
12311229 + ret = -EIO;
12321230 +
12331231 + 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>
1919
2020 --- a/cmd/nvedit.c
2121 +++ b/cmd/nvedit.c
22-@@ -50,6 +50,7 @@ DECLARE_GLOBAL_DATA_PTR;
22+@@ -48,6 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
2323 defined(CONFIG_ENV_IS_IN_MMC) || \
2424 defined(CONFIG_ENV_IS_IN_FAT) || \
2525 defined(CONFIG_ENV_IS_IN_EXT4) || \
@@ -27,7 +27,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
2727 defined(CONFIG_ENV_IS_IN_NAND) || \
2828 defined(CONFIG_ENV_IS_IN_NVRAM) || \
2929 defined(CONFIG_ENV_IS_IN_ONENAND) || \
30-@@ -64,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR;
30+@@ -62,7 +63,7 @@ DECLARE_GLOBAL_DATA_PTR;
3131
3232 #if !defined(ENV_IS_IN_DEVICE) && \
3333 !defined(CONFIG_ENV_IS_NOWHERE)
@@ -47,7 +47,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
4747 help
4848 Define this if you don't want to or can't have an environment stored
4949 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
5151 This value is also in units of bytes, but must also be aligned to
5252 an MMC sector boundary.
5353
@@ -75,7 +75,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
7575 config ENV_IS_IN_NAND
7676 bool "Environment in a NAND device"
7777 depends on !CHAIN_OF_TRUST
78-@@ -534,10 +555,16 @@ config ENV_ADDR_REDUND
78+@@ -535,10 +556,16 @@ config ENV_ADDR_REDUND
7979 Offset from the start of the device (or partition) of the redundant
8080 environment location.
8181
@@ -93,7 +93,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
9393 default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
9494 default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
9595 default 0x88000 if ARCH_SUNXI
96-@@ -582,6 +609,12 @@ config ENV_SECT_SIZE
96+@@ -583,6 +610,12 @@ config ENV_SECT_SIZE
9797 help
9898 Size of the sector containing the environment.
9999
@@ -389,7 +389,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
389389 +};
390390 --- a/include/env_internal.h
391391 +++ b/include/env_internal.h
392-@@ -131,6 +131,7 @@ enum env_location {
392+@@ -130,6 +130,7 @@ enum env_location {
393393 ENVL_FAT,
394394 ENVL_FLASH,
395395 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>
8585 snor: snor@11014000 {
8686 compatible = "mediatek,mtk-snor";
8787 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
13188 --- /dev/null
13289 +++ b/configs/mt7629_nand_rfb_defconfig
13390 @@ -0,0 +1,111 @@
@@ -244,7 +201,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
244201 +# CONFIG_EFI_LOADER is not set
245202 --- a/include/configs/mt7629.h
246203 +++ b/include/configs/mt7629.h
247-@@ -30,12 +30,19 @@
204+@@ -25,12 +25,19 @@
248205
249206 /* Defines for SPL */
250207 #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>
5555 reg = <0x11014000 0x1000>;
5656 --- a/configs/mt7622_rfb_defconfig
5757 +++ b/configs/mt7622_rfb_defconfig
58-@@ -15,6 +15,7 @@ CONFIG_LOG=y
58+@@ -16,6 +16,7 @@ CONFIG_LOG=y
5959 CONFIG_SYS_PROMPT="MT7622> "
6060 CONFIG_CMD_BOOTMENU=y
6161 CONFIG_CMD_MMC=y
@@ -63,7 +63,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
6363 CONFIG_CMD_PCI=y
6464 CONFIG_CMD_SF_TEST=y
6565 CONFIG_CMD_PING=y
66-@@ -27,6 +28,10 @@ CONFIG_SYSCON=y
66+@@ -28,6 +29,10 @@ CONFIG_SYSCON=y
6767 CONFIG_CLK=y
6868 CONFIG_MMC_HS200_SUPPORT=y
6969 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>
1414
1515 --- a/configs/mt7629_rfb_defconfig
1616 +++ b/configs/mt7629_rfb_defconfig
17-@@ -28,9 +28,14 @@ CONFIG_SPL_WATCHDOG=y
17+@@ -29,9 +29,14 @@ CONFIG_SPL_WATCHDOG=y
1818 CONFIG_HUSH_PARSER=y
1919 CONFIG_SYS_PROMPT="U-Boot> "
2020 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>
2121 CONFIG_DEBUG_UART_BASE=0x11002000
2222 CONFIG_DEBUG_UART_CLOCK=25000000
2323 CONFIG_DEBUG_UART=y
24-@@ -21,6 +23,9 @@ CONFIG_CMD_SF_TEST=y
24+@@ -22,6 +24,9 @@ CONFIG_CMD_SF_TEST=y
2525 CONFIG_CMD_PING=y
2626 CONFIG_CMD_SMC=y
2727 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 @@
11 --- a/tools/Makefile
22 +++ b/tools/Makefile
3-@@ -118,7 +118,6 @@ dumpimage-mkimage-objs := aisimage.o \
3+@@ -119,7 +119,6 @@ dumpimage-mkimage-objs := aisimage.o \
44 imximage.o \
55 imx8image.o \
66 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 @@
11 --- a/Makefile
22 +++ b/Makefile
3-@@ -1051,7 +1051,7 @@ quiet_cmd_pad_cat = CAT $@
3+@@ -1045,7 +1045,7 @@ quiet_cmd_pad_cat = CAT $@
44 cmd_pad_cat = $(cmd_objcopy) && $(append) || { rm -f $@; false; }
55
66 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 @@
6666 static int do_iminfo(struct cmd_tbl *cmdtp, int flag, int argc,
6767 char *const argv[])
6868 {
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
7272 return "unknown";
7373 }
7474
@@ -122,7 +122,7 @@
122122 int arch, int image_type, int bootstage_id,
123123 --- a/include/image.h
124124 +++ 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,
126126 ulong *addr, const char **image_name);
127127
128128 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 @@
11 --- a/cmd/Kconfig
22 +++ b/cmd/Kconfig
3-@@ -484,6 +484,12 @@ config CMD_ENV_EXISTS
3+@@ -483,6 +483,12 @@ config CMD_ENV_EXISTS
44 Check if a variable is defined in the environment for use in
55 shell scripting.
66
@@ -15,7 +15,7 @@
1515 help
1616 --- a/cmd/nvedit.c
1717 +++ 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
1919 }
2020 #endif
2121
@@ -76,7 +76,7 @@
7676 #if defined(CONFIG_CMD_ENV_CALLBACK)
7777 static int print_static_binding(const char *var_name, const char *callback_name,
7878 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[] = {
8080 U_BOOT_CMD_MKENT(load, 1, 0, do_env_load, "", ""),
8181 #endif
8282 U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""),
@@ -86,7 +86,7 @@
8686 #if defined(CONFIG_CMD_RUN)
8787 U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""),
8888 #endif
89-@@ -1465,6 +1522,9 @@ static char env_help_text[] =
89+@@ -1277,6 +1334,9 @@ static char env_help_text[] =
9090 #if defined(CONFIG_CMD_NVEDIT_EFI)
9191 "env print -e [-guid guid] [-n] [name ...] - print UEFI environment\n"
9292 #endif
@@ -96,7 +96,7 @@
9696 #if defined(CONFIG_CMD_RUN)
9797 "env run var [...] - run commands in an environment variable\n"
9898 #endif
99-@@ -1574,6 +1634,17 @@ U_BOOT_CMD(
99+@@ -1386,6 +1446,17 @@ U_BOOT_CMD(
100100 );
101101 #endif
102102
--- 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 @@
3838 env_relocate();
3939 return 0;
4040 }
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
4646
4747 +config RESET_BUTTON_LABEL
4848 + 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
121 --- a/board/mediatek/mt7623/mt7623_rfb.c
132 +++ b/board/mediatek/mt7623/mt7623_rfb.c
143 @@ -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 @@
11 --- a/drivers/mtd/spi/spi-nor-ids.c
22 +++ 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[] =
44 SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
55 },
66 { 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 @@
11 --- a/configs/mt7623n_bpir2_defconfig
22 +++ b/configs/mt7623n_bpir2_defconfig
3-@@ -4,52 +4,137 @@ CONFIG_ARCH_MEDIATEK=y
3+@@ -4,53 +4,138 @@ CONFIG_ARCH_MEDIATEK=y
44 CONFIG_SYS_TEXT_BASE=0x81e00000
55 CONFIG_SYS_MALLOC_F_LEN=0x4000
66 CONFIG_NR_DRAM_BANKS=1
@@ -12,6 +12,7 @@
1212 +CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2"
1313 +CONFIG_USE_DEFAULT_ENV_FILE=y
1414 CONFIG_DISTRO_DEFAULTS=y
15+ CONFIG_SYS_LOAD_ADDR=0x84000000
1516 CONFIG_FIT=y
1617 -CONFIG_FIT_VERBOSE=y
1718 +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 @@
11 --- a/configs/mt7623a_unielec_u7623_02_defconfig
22 +++ 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
44 CONFIG_SYS_TEXT_BASE=0x81e00000
55 CONFIG_SYS_MALLOC_F_LEN=0x4000
66 CONFIG_NR_DRAM_BANKS=1
@@ -11,6 +11,7 @@
1111 +CONFIG_USE_DEFAULT_ENV_FILE=y
1212 CONFIG_TARGET_MT7623=y
1313 CONFIG_DISTRO_DEFAULTS=y
14+ CONFIG_SYS_LOAD_ADDR=0x84000000
1415 CONFIG_FIT=y
1516 -CONFIG_FIT_VERBOSE=y
1617 +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 @@
11 --- /dev/null
22 +++ b/configs/mt7622_bananapi_bpi-r64-sdmmc_defconfig
3-@@ -0,0 +1,158 @@
3+@@ -0,0 +1,159 @@
44 +CONFIG_ARM=y
55 +CONFIG_POSITION_INDEPENDENT=y
66 +CONFIG_ARCH_MEDIATEK=y
77 +CONFIG_TARGET_MT7622=y
88 +CONFIG_SYS_TEXT_BASE=0x41e00000
99 +CONFIG_SYS_MALLOC_F_LEN=0x4000
10++CONFIG_SYS_LOAD_ADDR=0x40080000
1011 +CONFIG_USE_DEFAULT_ENV_FILE=y
1112 +CONFIG_BOARD_LATE_INIT=y
1213 +CONFIG_BOOTP_SEND_HOSTNAME=y
@@ -246,13 +247,14 @@
246247 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver"
247248 --- /dev/null
248249 +++ b/configs/mt7622_bananapi_bpi-r64-emmc_defconfig
249-@@ -0,0 +1,145 @@
250+@@ -0,0 +1,146 @@
250251 +CONFIG_ARM=y
251252 +CONFIG_POSITION_INDEPENDENT=y
252253 +CONFIG_ARCH_MEDIATEK=y
253254 +CONFIG_TARGET_MT7622=y
254255 +CONFIG_SYS_TEXT_BASE=0x41e00000
255256 +CONFIG_SYS_MALLOC_F_LEN=0x4000
257++CONFIG_SYS_LOAD_ADDR=0x40080000
256258 +CONFIG_USE_DEFAULT_ENV_FILE=y
257259 +CONFIG_BOARD_LATE_INIT=y
258260 +CONFIG_BOOTP_SEND_HOSTNAME=y
@@ -453,12 +455,13 @@
453455 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver"
454456 --- /dev/null
455457 +++ b/configs/mt7622_bananapi_bpi-r64-snand_defconfig
456-@@ -0,0 +1,139 @@
458+@@ -0,0 +1,140 @@
457459 +CONFIG_ARM=y
458460 +CONFIG_POSITION_INDEPENDENT=y
459461 +CONFIG_ARCH_MEDIATEK=y
460462 +CONFIG_SYS_TEXT_BASE=0x41e00000
461463 +CONFIG_SYS_MALLOC_F_LEN=0x4000
464++CONFIG_SYS_LOAD_ADDR=0x40080000
462465 +CONFIG_USE_DEFAULT_ENV_FILE=y
463466 +CONFIG_BOARD_LATE_INIT=y
464467 +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 @@
11 --- /dev/null
22 +++ b/configs/mt7622_linksys_e8450_defconfig
3-@@ -0,0 +1,135 @@
3+@@ -0,0 +1,136 @@
44 +CONFIG_ARM=y
55 +CONFIG_POSITION_INDEPENDENT=y
66 +CONFIG_ARCH_MEDIATEK=y
77 +CONFIG_TARGET_MT7622=y
88 +CONFIG_SYS_TEXT_BASE=0x41e00000
99 +CONFIG_SYS_MALLOC_F_LEN=0x4000
10++CONFIG_SYS_LOAD_ADDR=0x40080000
1011 +CONFIG_USE_DEFAULT_ENV_FILE=y
1112 +CONFIG_BOARD_LATE_INIT=y
1213 +CONFIG_BOOTP_SEND_HOSTNAME=y
@@ -336,7 +337,7 @@
336337 +};
337338 --- a/arch/arm/dts/Makefile
338339 +++ b/arch/arm/dts/Makefile
339-@@ -1104,6 +1104,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
340+@@ -1133,6 +1133,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
340341 mt7622-rfb.dtb \
341342 mt7623a-unielec-u7623-02-emmc.dtb \
342343 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 @@
11 --- /dev/null
22 +++ b/configs/mt7622_ubnt_unifi-6-lr_defconfig
3-@@ -0,0 +1,140 @@
3+@@ -0,0 +1,141 @@
44 +CONFIG_ARM=y
55 +CONFIG_POSITION_INDEPENDENT=y
66 +CONFIG_ARCH_MEDIATEK=y
77 +CONFIG_TARGET_MT7622=y
88 +CONFIG_SYS_TEXT_BASE=0x41e00000
99 +CONFIG_SYS_MALLOC_F_LEN=0x4000
10++CONFIG_SYS_LOAD_ADDR=0x40080000
1011 +CONFIG_USE_DEFAULT_ENV_FILE=y
1112 +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)"
1213 +CONFIG_ENV_IS_IN_MTD=y
@@ -348,7 +349,7 @@
348349 +};
349350 --- a/arch/arm/dts/Makefile
350351 +++ b/arch/arm/dts/Makefile
351-@@ -1105,6 +1105,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
352+@@ -1134,6 +1134,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
352353 mt7623a-unielec-u7623-02-emmc.dtb \
353354 mt7622-bananapi-bpi-r64.dtb \
354355 mt7622-linksys-e8450-ubi.dtb \
@@ -411,7 +412,7 @@
411412 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver"
412413 --- a/common/board_r.c
413414 +++ b/common/board_r.c
414-@@ -77,6 +77,7 @@
415+@@ -78,6 +78,7 @@
415416 #ifdef CONFIG_EFI_SETUP_EARLY
416417 #include <efi_loader.h>
417418 #endif
@@ -419,7 +420,7 @@
419420
420421 DECLARE_GLOBAL_DATA_PTR;
421422
422-@@ -416,6 +417,21 @@ static int initr_onenand(void)
423+@@ -417,6 +418,21 @@ static int initr_onenand(void)
423424 }
424425 #endif
425426
Show on old repository browser