From: Daniel Golle Date: Wed, 8 Oct 2025 17:57:16 +0000 (+0100) Subject: uboot-mediatek: update to U-Boot v2025.10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F20349%2Fhead;p=thirdparty%2Fopenwrt.git uboot-mediatek: update to U-Boot v2025.10 The most relevant change is the removal of the empty board_init() functions by u-boot/u-boot@70a4d1fa1dd, which makes many patches not apply anymore and also requires most board defconfigs to be updated by adding "# CONFIG_BOARD_INIT is not set" to them. Also some config symbols have been renamed and downstream boards had to be adapted accordingly: u-boot/u-boot@0fd9a3480a0 ("env: Rename OVERWRITE_ETHADDR_ONCE to ENV_OVERWRITE_ETHADDR_ONCE") u-boot/u-boot@5fb88fa725d ("env: Rename SYS_REDUNDAND_ENVIRONMENT to ENV_REDUNDANT") u-boot/u-boot@123682c7651 ("env: Rename SYS_RELOC_GD_ENV_ADDR to ENV_RELOC_GD_ENV_ADDR") u-boot/u-boot@0f44d5549ed ("env: Rename SYS_MMC_ENV_DEV to ENV_MMC_DEVICE_INDEX") u-boot/u-boot@31617b880ab ("env: Rename SYS_MMC_ENV_PART to ENV_MMC_EMMC_HW_PARTITION") u-boot/u-boot@ffc4914703a ("env: Rename ENV_MMC_PARTITION to ENV_MMC_SW_PARTITION") u-boot/u-boot@fb5235239aa ("env: Rename DEFAULT_ENV_FILE to ENV_DEFAULT_ENV_TEXT_FILE") (also renamed USE_DEFAULT_ENV_FILE to USE_ENV_DEFAULT_ENV_TEXT_FILE) Remove upstreamed patches: * 001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch u-boot/u-boot@fe37fb8214e * 002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch u-boot/u-boot@506ceddffdc * 003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch u-boot/u-boot@70db2be9fba * 004-01-serial-mediatek-fix-register-names-and-offsets.patch u-boot/u-boot@6e15d3f91aa * 004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch u-boot/u-boot@6952209ef22 * 005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch u-boot/u-boot@1bf21212976 * 006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch u-boot/u-boot@0ffd456516b * 130-01-env-mtd-add-the-missing-put_mtd_device.patch u-boot/u-boot@39ae954b04e * 130-02-env-mtd-initialize-saved_buf-pointer.patch u-boot/u-boot@7e842bd3315 * 170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch u-boot/u-boot@8c986521c3c Signed-off-by: Daniel Golle --- diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index c2bd0189e8a..c233731a605 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2025.07 -PKG_HASH:=0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 +PKG_VERSION:=2025.10 +PKG_HASH:=b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host UBOOT_USE_INTREE_DTC:=1 diff --git a/package/boot/uboot-mediatek/patches/001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch b/package/boot/uboot-mediatek/patches/001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch deleted file mode 100644 index 08fc4c9699c..00000000000 --- a/package/boot/uboot-mediatek/patches/001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fe37fb8214e40ea64cf03453d112527b629fb08a Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Sat, 7 Jun 2025 23:11:21 +0200 -Subject: [PATCH] mtd: spinand: winbond: add Winbond W25N04KV flash support - -Add Winbond W25N04KV flash support that use a different value to detect -ECC bitflip. - -Signed-off-by: Christian Marangi ---- - drivers/mtd/nand/spi/winbond.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/drivers/mtd/nand/spi/winbond.c -+++ b/drivers/mtd/nand/spi/winbond.c -@@ -11,6 +11,7 @@ - #include - #include - #endif -+#include - #include - #include - -@@ -18,6 +19,8 @@ - - #define WINBOND_CFG_BUF_READ BIT(3) - -+#define W25N04KV_STATUS_ECC_5_8_BITFLIPS GENMASK(5, 4) -+ - static SPINAND_OP_VARIANTS(read_cache_variants, - SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), - SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), -@@ -121,6 +124,7 @@ static int w25n02kv_ecc_get_status(struc - return -EBADMSG; - - case STATUS_ECC_HAS_BITFLIPS: -+ case W25N04KV_STATUS_ECC_5_8_BITFLIPS: - /* - * Let's try to retrieve the real maximum number of bitflips - * in order to avoid forcing the wear-leveling layer to move -@@ -169,6 +173,15 @@ static const struct spinand_info winbond - NAND_ECCREQ(8, 512), - SPINAND_INFO_OP_VARIANTS(&read_cache_variants, - &write_cache_variants, -+ &update_cache_variants), -+ 0, -+ SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)), -+ SPINAND_INFO("W25N04KV", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x23), -+ NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 2, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ &write_cache_variants, - &update_cache_variants), - 0, - SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)), diff --git a/package/boot/uboot-mediatek/patches/002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch b/package/boot/uboot-mediatek/patches/002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch deleted file mode 100644 index 22c60f03ab2..00000000000 --- a/package/boot/uboot-mediatek/patches/002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 506ceddffdc40acf709822b678b986e2e22c5056 Mon Sep 17 00:00:00 2001 -From: Chuanhong Guo -Date: Wed, 1 May 2024 15:45:23 +0800 -Subject: [PATCH] mtd/spinand: gigadevice: sync supported chips with linux 6.9 - -Adding support for: -GD5F1GQ4RExxG -GD5F2GQ4UExxG -GD5F2GQ4RExxG -GD5F1GQ5RExxG -GD5F2GQ5UExxG -GD5F2GQ5RExxG -GD5F4GQ6UExxG -GD5F4GQ6RExxG -GD5F1GM7UExxG -GD5F1GM7RExxG -GD5F2GM7UExxG -GD5F2GM7RExxG -GD5F4GM8UExxG -GD5F4GM8RExxG -GD5F2GQ5xExxH -GD5F1GQ5RExxH -GD5F1GQ4RExxH - -Signed-off-by: Chuanhong Guo ---- - drivers/mtd/nand/spi/gigadevice.c | 188 +++++++++++++++++++++++++++++- - 1 file changed, 187 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/nand/spi/gigadevice.c -+++ b/drivers/mtd/nand/spi/gigadevice.c -@@ -43,6 +43,22 @@ static SPINAND_OP_VARIANTS(read_cache_va - SPINAND_PAGE_READ_FROM_CACHE_OP_3A(true, 0, 1, NULL, 0), - SPINAND_PAGE_READ_FROM_CACHE_OP_3A(false, 0, 0, NULL, 0)); - -+static SPINAND_OP_VARIANTS(read_cache_variants_1gq5, -+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0)); -+ -+static SPINAND_OP_VARIANTS(read_cache_variants_2gq5, -+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0)); -+ - static SPINAND_OP_VARIANTS(write_cache_variants, - SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), - SPINAND_PROG_LOAD(true, 0, NULL, 0)); -@@ -329,6 +345,36 @@ static const struct spinand_info gigadev - SPINAND_HAS_QE_BIT, - SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, - gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GQ4RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xc1), -+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GQ4UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xd2), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GQ4RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xc2), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), - SPINAND_INFO("GD5F1GQ4UFxxG", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE, 0xb1, 0x48), - NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -@@ -343,12 +389,152 @@ static const struct spinand_info gigadev - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x51), - NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), - NAND_ECCREQ(4, 512), -- SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, - &write_cache_variants, - &update_cache_variants), - SPINAND_HAS_QE_BIT, - SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, - gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GQ5RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x41), -+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GQ5UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x52), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_2gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GQ5RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x42), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_2gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F4GQ6UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x55), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 2, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_2gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F4GQ6RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x45), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 2, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_2gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq5xexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GM7UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x91), -+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GM7RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x81), -+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GM7UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x92), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GM7RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x82), -+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F4GM8UExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x95), -+ NAND_MEMORG(1, 2048, 128, 64, 4096, 80, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F4GM8RExxG", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x85), -+ NAND_MEMORG(1, 2048, 128, 64, 4096, 80, 1, 1, 1), -+ NAND_ECCREQ(8, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F2GQ5xExxH", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x22), -+ NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_2gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GQ5RExxH", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x21), -+ NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), -+ SPINAND_INFO("GD5F1GQ4RExxH", -+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xc9), -+ NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), -+ NAND_ECCREQ(4, 512), -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, -+ &write_cache_variants, -+ &update_cache_variants), -+ SPINAND_HAS_QE_BIT, -+ SPINAND_ECCINFO(&gd5fxgqx_variant2_ooblayout, -+ gd5fxgq4uexxg_ecc_get_status)), - }; - - static const struct spinand_manufacturer_ops gigadevice_spinand_manuf_ops = { diff --git a/package/boot/uboot-mediatek/patches/003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch b/package/boot/uboot-mediatek/patches/003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch deleted file mode 100644 index f5eab790462..00000000000 --- a/package/boot/uboot-mediatek/patches/003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc495442ba610b190775122a31f958ad74229262 Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Tue, 8 Jul 2025 17:53:48 +0800 -Subject: [PATCH] net: mediatek: correct the AN8855 TPID value in port - isolation settings - -The TPID value should be 0x9100 instead of 0x8100 according to the -datasheet. - -Fixes: cedafee9ff3 (net: mediatek: add support for Airoha AN8855 ethernet switch) -Signed-off-by: Weijie Gao ---- - drivers/net/mtk_eth/an8855.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/mtk_eth/an8855.c -+++ b/drivers/net/mtk_eth/an8855.c -@@ -909,7 +909,7 @@ static void an8855_port_isolation(struct - - /* Set port mode to user port */ - an8855_reg_write(priv, AN8855_PVC(i), -- (0x8100 << AN8855_STAG_VPID_S) | -+ (0x9100 << AN8855_STAG_VPID_S) | - (VLAN_ATTR_USER << AN8855_VLAN_ATTR_S)); - } - } diff --git a/package/boot/uboot-mediatek/patches/004-01-serial-mediatek-fix-register-names-and-offsets.patch b/package/boot/uboot-mediatek/patches/004-01-serial-mediatek-fix-register-names-and-offsets.patch deleted file mode 100644 index e9e7160d531..00000000000 --- a/package/boot/uboot-mediatek/patches/004-01-serial-mediatek-fix-register-names-and-offsets.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6e15d3f91aa698798578d39a6d9e292fcc5c577f Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Fri, 23 May 2025 17:25:55 +0800 -Subject: [PATCH] serial: mediatek: fix register names and offsets - -Fix UART register names and offsets according to the programming -guide to allow implementing some enhanced features. - -Signed-off-by: Weijie Gao ---- - drivers/serial/serial_mtk.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - ---- a/drivers/serial/serial_mtk.c -+++ b/drivers/serial/serial_mtk.c -@@ -30,16 +30,23 @@ struct mtk_serial_regs { - u32 mcr; - u32 lsr; - u32 msr; -- u32 spr; -- u32 mdr1; -+ u32 scr; -+ u32 autobaud_en; - u32 highspeed; - u32 sample_count; - u32 sample_point; -+ u32 autobaud_reg; -+ u32 ratefix_ad; -+ u32 autobaud_sample; -+ u32 guard; -+ u32 escape_dat; -+ u32 escape_en; -+ u32 sleep_en; -+ u32 dma_en; -+ u32 rxtri_ad; - u32 fracdiv_l; - u32 fracdiv_m; -- u32 escape_en; -- u32 guard; -- u32 rx_sel; -+ u32 fcr_rd; - }; - - #define thr rbr diff --git a/package/boot/uboot-mediatek/patches/004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch b/package/boot/uboot-mediatek/patches/004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch deleted file mode 100644 index 0dd1cdd4360..00000000000 --- a/package/boot/uboot-mediatek/patches/004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6952209ef220138189dd261d06441e1b2d50e994 Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Fri, 23 May 2025 17:26:02 +0800 -Subject: [PATCH] serial: mediatek: enable baudrate accuracy compensation - -The high-speed UART from MediaTek supports baudrate accuracy -compensation when using high-speed mode 3. - -This is done by calculating the first digit of the fraction part of -sample count value. The fraction value will be then used as the -reference to insert 0 to 10 sample cycle(s) to one frame (assume -that frame format is 8n1, i.e. 10 bits per frame). - -The fracdiv_[l/m] registers are used to determine whether a bit in one frame -should be inserted with one sample cycle. - -With typical 40MHz source clock, the actual baudrates with/without -accuracy compensation are: - -Ideal w/o compensation w/ compensation -======== ================ =============== -9600 9603 9600 -115200 114942 115207 -921600 930232 921659 -3000000 3076923 3007519 - -Signed-off-by: Weijie Gao ---- - drivers/serial/serial_mtk.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - ---- a/drivers/serial/serial_mtk.c -+++ b/drivers/serial/serial_mtk.c -@@ -99,10 +99,18 @@ struct mtk_serial_priv { - bool upstream_highspeed_logic; - }; - -+static const unsigned short fraction_l_mapping[] = { -+ 0, 1, 0x5, 0x15, 0x55, 0x57, 0x57, 0x77, 0x7F, 0xFF, 0xFF -+}; -+ -+static const unsigned short fraction_m_mapping[] = { -+ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 3 -+}; -+ - static void _mtk_serial_setbrg(struct mtk_serial_priv *priv, int baud, - uint clk_rate) - { -- u32 quot, realbaud, samplecount = 1; -+ u32 quot, realbaud, samplecount = 1, fraction, frac_l = 0, frac_m = 0; - - /* Special case for low baud clock */ - if (baud <= 115200 && clk_rate == 12000000) { -@@ -147,7 +155,13 @@ use_hs3: - writel(3, &priv->regs->highspeed); - - quot = DIV_ROUND_UP(clk_rate, 256 * baud); -- samplecount = DIV_ROUND_CLOSEST(clk_rate, quot * baud); -+ samplecount = clk_rate / (quot * baud); -+ -+ fraction = ((clk_rate * 100) / quot / baud) % 100; -+ fraction = DIV_ROUND_CLOSEST(fraction, 10); -+ -+ frac_l = fraction_l_mapping[fraction]; -+ frac_m = fraction_m_mapping[fraction]; - } - - set_baud: -@@ -159,7 +173,11 @@ set_baud: - - /* set highspeed mode sample count & point */ - writel(samplecount - 1, &priv->regs->sample_count); -- writel((samplecount - 2) >> 1, &priv->regs->sample_point); -+ writel((samplecount >> 1) - 1, &priv->regs->sample_point); -+ -+ /* set baudrate fraction compensation */ -+ writel(frac_l, &priv->regs->fracdiv_l); -+ writel(frac_m, &priv->regs->fracdiv_m); - } - - static int _mtk_serial_putc(struct mtk_serial_priv *priv, const char ch) diff --git a/package/boot/uboot-mediatek/patches/005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch b/package/boot/uboot-mediatek/patches/005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch deleted file mode 100644 index 726c59bad2a..00000000000 --- a/package/boot/uboot-mediatek/patches/005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 1bf212129768d65a47145209c65bf37b6082d718 Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Tue, 6 May 2025 16:12:20 +0800 -Subject: [PATCH] clk: mediatek: add dummy clk enable/disable ops for - apmixedsys clocks - -Starting from commit ac30d90f336 (clk: Ensure the parent clocks are enabled -while reparenting), MediaTek filogic platforms will crash on booting when -initializing mmc devices. - -The root cause is that to simplify the code, we reused the topckgen ops for -apmixedsys clocks as they share the get_rate with topckgen clocks while the -clk enable/disable ops are not available for apmixedsys clocks. - -Now that a clock will be enabled first before reparenting, we have to add -dummy enable/disable ops for apmixedsys to avoid unexpected behavior when -apmixedsys clocks are the parent clock of the to-be-reparenting clocks. - -Fixes: 40746bf429d (clk: mediatek: add clock driver support for MediaTek MT7981 SoC) -Fixes: 37d5a9a29dc (clk: mediatek: add clock driver support for MediaTek MT7986 SoC) -Fixes: ece4e5804f5 (clk: mediatek: add clock driver support for MediaTek MT7987 SoC) -Fixes: 421436981a2 (clk: mediatek: add clock driver support for MediaTek MT7988 SoC) -Signed-off-by: Sam Shih -Signed-off-by: Weijie Gao ---- - drivers/clk/mediatek/clk-mt7981.c | 2 +- - drivers/clk/mediatek/clk-mt7986.c | 2 +- - drivers/clk/mediatek/clk-mt7987.c | 2 +- - drivers/clk/mediatek/clk-mt7988.c | 2 +- - drivers/clk/mediatek/clk-mtk.c | 11 +++++++++++ - drivers/clk/mediatek/clk-mtk.h | 1 + - 6 files changed, 16 insertions(+), 4 deletions(-) - ---- a/drivers/clk/mediatek/clk-mt7981.c -+++ b/drivers/clk/mediatek/clk-mt7981.c -@@ -566,7 +566,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { - .of_match = mt7981_fixed_pll_compat, - .probe = mt7981_fixed_pll_probe, - .priv_auto = sizeof(struct mtk_clk_priv), -- .ops = &mtk_clk_topckgen_ops, -+ .ops = &mtk_clk_fixed_pll_ops, - .flags = DM_FLAG_PRE_RELOC, - }; - ---- a/drivers/clk/mediatek/clk-mt7986.c -+++ b/drivers/clk/mediatek/clk-mt7986.c -@@ -573,7 +573,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { - .of_match = mt7986_fixed_pll_compat, - .probe = mt7986_fixed_pll_probe, - .priv_auto = sizeof(struct mtk_clk_priv), -- .ops = &mtk_clk_topckgen_ops, -+ .ops = &mtk_clk_fixed_pll_ops, - .flags = DM_FLAG_PRE_RELOC, - }; - ---- a/drivers/clk/mediatek/clk-mt7987.c -+++ b/drivers/clk/mediatek/clk-mt7987.c -@@ -67,7 +67,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { - .of_match = mt7987_fixed_pll_compat, - .probe = mt7987_fixed_pll_probe, - .priv_auto = sizeof(struct mtk_clk_priv), -- .ops = &mtk_clk_topckgen_ops, -+ .ops = &mtk_clk_fixed_pll_ops, - .flags = DM_FLAG_PRE_RELOC, - }; - ---- a/drivers/clk/mediatek/clk-mt7988.c -+++ b/drivers/clk/mediatek/clk-mt7988.c -@@ -830,7 +830,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { - .of_match = mt7988_fixed_pll_compat, - .probe = mt7988_fixed_pll_probe, - .priv_auto = sizeof(struct mtk_clk_priv), -- .ops = &mtk_clk_topckgen_ops, -+ .ops = &mtk_clk_fixed_pll_ops, - .flags = DM_FLAG_PRE_RELOC, - }; - ---- a/drivers/clk/mediatek/clk-mtk.c -+++ b/drivers/clk/mediatek/clk-mtk.c -@@ -47,6 +47,11 @@ static int mtk_clk_get_id(struct clk *cl - return id; - } - -+static int mtk_dummy_enable(struct clk *clk) -+{ -+ return 0; -+} -+ - static int mtk_gate_enable(void __iomem *base, const struct mtk_gate *gate) - { - u32 bit = BIT(gate->shift); -@@ -752,6 +757,12 @@ const struct clk_ops mtk_clk_apmixedsys_ - .get_rate = mtk_apmixedsys_get_rate, - }; - -+const struct clk_ops mtk_clk_fixed_pll_ops = { -+ .enable = mtk_dummy_enable, -+ .disable = mtk_dummy_enable, -+ .get_rate = mtk_topckgen_get_rate, -+}; -+ - const struct clk_ops mtk_clk_topckgen_ops = { - .enable = mtk_clk_mux_enable, - .disable = mtk_clk_mux_disable, ---- a/drivers/clk/mediatek/clk-mtk.h -+++ b/drivers/clk/mediatek/clk-mtk.h -@@ -283,6 +283,7 @@ struct mtk_cg_priv { - }; - - extern const struct clk_ops mtk_clk_apmixedsys_ops; -+extern const struct clk_ops mtk_clk_fixed_pll_ops; - extern const struct clk_ops mtk_clk_topckgen_ops; - extern const struct clk_ops mtk_clk_infrasys_ops; - extern const struct clk_ops mtk_clk_gate_ops; diff --git a/package/boot/uboot-mediatek/patches/006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch b/package/boot/uboot-mediatek/patches/006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch deleted file mode 100644 index f98dcfe95f1..00000000000 --- a/package/boot/uboot-mediatek/patches/006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0ffd456516b5f0c126c9705d6b2368a45ee2353f Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Sun, 29 Jun 2025 15:21:18 +0200 -Subject: [PATCH] env: Fix possible out-of-bound access in env_do_env_set - -It was discovered that env_do_env_set() currently suffer from a long -time of a possible out-of-bound access for the argv array handling. - -The BUG is present in the function env_do_env_set() line: - -name = argv[1]; - -where the function at this point assume the argv at index 1 is always -present and can't be NULL. Aside from the fact that it's always -better to validate argv entry with the argc variable, situation where -the argv[1] is NULL is actually possible and not an error condition. - -A example of where an out-of-bound access is triggered is with the -command "askenv - Press ENTER to ...". -This is a common pattern for bootmenu entry to ask the user input after -a bootmenu command succeeded. - -In the context of such command, the while loop before "name = argv[1];" -parse the "-" char as an option arg and increment the argv pointer by -one (to make the rest of the logic code ignore the option argv) and -decrement argc value. - -The while loop logic is correct but at the "name = argv[1];" line, the -argv have only one element left (the "-" char) and accessing argv[1] -(aka the secong element from argv pointer) cause an out-of-bound access -(making the bootloader eventually crash with strchr searching in invalid -data) - -To better handle this and prevent the out-of-bound access, actually -check the argv entry left (with the use of the argc variable) and exit -early before doing any kind of array access. - -Signed-off-by: Christian Marangi ---- - env/common.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/env/common.c -+++ b/env/common.c -@@ -82,6 +82,10 @@ int env_do_env_set(int flag, int argc, c - } - } - debug("Final value for argc=%d\n", argc); -+ /* Exit early if we don't have an env to apply */ -+ if (argc < 2) -+ return 0; -+ - name = argv[1]; - - if (strchr(name, '=')) { diff --git a/package/boot/uboot-mediatek/patches/100-03-mtd-add-a-new-mtd-device-type-for-NMBM.patch b/package/boot/uboot-mediatek/patches/100-03-mtd-add-a-new-mtd-device-type-for-NMBM.patch index 9512adb71d2..94c31100edb 100644 --- a/package/boot/uboot-mediatek/patches/100-03-mtd-add-a-new-mtd-device-type-for-NMBM.patch +++ b/package/boot/uboot-mediatek/patches/100-03-mtd-add-a-new-mtd-device-type-for-NMBM.patch @@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c -@@ -1054,6 +1054,9 @@ int mtd_id_parse(const char *id, const c +@@ -1055,6 +1055,9 @@ int mtd_id_parse(const char *id, const c } else if (strncmp(p, "spi-nand", 8) == 0) { *dev_type = MTD_DEV_TYPE_SPINAND; p += 8; diff --git a/package/boot/uboot-mediatek/patches/100-06-common-board_r-add-support-to-initialize-NMBM-after-.patch b/package/boot/uboot-mediatek/patches/100-06-common-board_r-add-support-to-initialize-NMBM-after-.patch index 3145217d78f..50a290c3e68 100644 --- a/package/boot/uboot-mediatek/patches/100-06-common-board_r-add-support-to-initialize-NMBM-after-.patch +++ b/package/boot/uboot-mediatek/patches/100-06-common-board_r-add-support-to-initialize-NMBM-after-.patch @@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao --- a/common/board_r.c +++ b/common/board_r.c -@@ -399,6 +399,20 @@ static int initr_nand(void) +@@ -398,6 +398,20 @@ static int initr_nand(void) } #endif @@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao #if defined(CONFIG_CMD_ONENAND) /* go init the NAND */ static int initr_onenand(void) -@@ -718,6 +732,9 @@ static void initcall_run_r(void) +@@ -713,6 +727,9 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(CMD_ONENAND) INITCALL(initr_onenand); #endif diff --git a/package/boot/uboot-mediatek/patches/100-07-cmd-add-nmbm-command.patch b/package/boot/uboot-mediatek/patches/100-07-cmd-add-nmbm-command.patch index 8cfad264fe9..9ae18aeb428 100644 --- a/package/boot/uboot-mediatek/patches/100-07-cmd-add-nmbm-command.patch +++ b/package/boot/uboot-mediatek/patches/100-07-cmd-add-nmbm-command.patch @@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1535,6 +1535,12 @@ config CMD_NAND_WATCH +@@ -1548,6 +1548,12 @@ config CMD_NAND_WATCH endif # CMD_NAND @@ -30,7 +30,7 @@ Signed-off-by: Weijie Gao depends on NVME --- a/cmd/Makefile +++ b/cmd/Makefile -@@ -130,6 +130,7 @@ obj-y += legacy-mtd-utils.o +@@ -131,6 +131,7 @@ obj-y += legacy-mtd-utils.o endif obj-$(CONFIG_CMD_MUX) += mux.o obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/package/boot/uboot-mediatek/patches/100-08-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch b/package/boot/uboot-mediatek/patches/100-08-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch index 19a46298769..1d10bccde63 100644 --- a/package/boot/uboot-mediatek/patches/100-08-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch +++ b/package/boot/uboot-mediatek/patches/100-08-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch @@ -20,7 +20,7 @@ Signed-off-by: SkyLake.Huang --- a/cmd/mtd.c +++ b/cmd/mtd.c -@@ -728,6 +728,42 @@ out_put_mtd: +@@ -741,6 +741,42 @@ out_put_mtd: return CMD_RET_SUCCESS; } @@ -63,7 +63,7 @@ Signed-off-by: SkyLake.Huang #ifdef CONFIG_AUTO_COMPLETE static int mtd_name_complete(int argc, char *const argv[], char last_char, int maxv, char *cmdv[]) -@@ -775,6 +811,7 @@ U_BOOT_LONGHELP(mtd, +@@ -788,6 +824,7 @@ U_BOOT_LONGHELP(mtd, "\n" "Specific functions:\n" "mtd bad \n" @@ -71,7 +71,7 @@ Signed-off-by: SkyLake.Huang #if CONFIG_IS_ENABLED(CMD_MTD_OTP) "mtd otpread [u|f] \n" "mtd otpwrite \n" -@@ -815,4 +852,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" +@@ -828,4 +865,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" U_BOOT_SUBCMD_MKENT_COMPLETE(erase, 4, 0, do_mtd_erase, mtd_name_complete), U_BOOT_SUBCMD_MKENT_COMPLETE(bad, 2, 1, do_mtd_bad, diff --git a/package/boot/uboot-mediatek/patches/100-10-cmd-add-a-new-command-for-NAND-flash-debugging.patch b/package/boot/uboot-mediatek/patches/100-10-cmd-add-a-new-command-for-NAND-flash-debugging.patch index ea3ba125389..dfafd5c3473 100644 --- a/package/boot/uboot-mediatek/patches/100-10-cmd-add-a-new-command-for-NAND-flash-debugging.patch +++ b/package/boot/uboot-mediatek/patches/100-10-cmd-add-a-new-command-for-NAND-flash-debugging.patch @@ -26,7 +26,7 @@ Signed-off-by: Weijie Gao --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1535,6 +1535,14 @@ config CMD_NAND_WATCH +@@ -1548,6 +1548,14 @@ config CMD_NAND_WATCH endif # CMD_NAND @@ -43,7 +43,7 @@ Signed-off-by: Weijie Gao bool "nmbm" --- a/cmd/Makefile +++ b/cmd/Makefile -@@ -130,6 +130,7 @@ obj-y += legacy-mtd-utils.o +@@ -131,6 +131,7 @@ obj-y += legacy-mtd-utils.o endif obj-$(CONFIG_CMD_MUX) += mux.o obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch b/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch index 96a276f7578..1f3b738b227 100644 --- a/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch +++ b/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch @@ -18,18 +18,19 @@ Signed-off-by: Weijie Gao --- a/env/Kconfig +++ b/env/Kconfig -@@ -74,7 +74,7 @@ config ENV_IS_DEFAULT +@@ -74,7 +74,8 @@ config ENV_IS_DEFAULT !ENV_IS_IN_MMC && !ENV_IS_IN_NAND && \ !ENV_IS_IN_NVRAM && !ENV_IS_IN_ONENAND && \ !ENV_IS_IN_REMOTE && !ENV_IS_IN_SPI_FLASH && \ -- !ENV_IS_IN_UBI && !ENV_IS_IN_MTD -+ !ENV_IS_IN_UBI && !ENV_IS_IN_NMBM && !ENV_IS_IN_MTD +- !ENV_IS_IN_UBI && !ENV_IS_IN_MTD && !ENV_IS_IN_SCSI ++ !ENV_IS_IN_UBI && !ENV_IS_IN_MTD && \ ++ !ENV_IS_IN_NMBM && !ENV_IS_IN_SCSI select ENV_IS_NOWHERE config ENV_IS_NOWHERE -@@ -297,6 +297,21 @@ config ENV_IS_IN_NAND - Currently, CONFIG_ENV_OFFSET_REDUND is not supported when - using CONFIG_ENV_OFFSET_OOB. +@@ -293,6 +294,21 @@ config ENV_IS_IN_SCSI + Define this if you have an SCSI device which you want to use for the + environment. +config ENV_IS_IN_NMBM + bool "Environment in a NMBM upper MTD layer" @@ -49,7 +50,7 @@ Signed-off-by: Weijie Gao config ENV_RANGE hex "Length of the region in which the environment can be written" depends on ENV_IS_IN_NAND -@@ -596,7 +611,7 @@ config ENV_ADDR_REDUND +@@ -592,7 +608,7 @@ config ENV_ADDR_REDUND config ENV_OFFSET hex "Environment offset" depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ @@ -70,7 +71,7 @@ Signed-off-by: Weijie Gao obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FLASH) += flash.o --- a/env/env.c +++ b/env/env.c -@@ -49,6 +49,9 @@ static enum env_location env_locations[] +@@ -52,6 +52,9 @@ static enum env_location env_locations[] #ifdef CONFIG_ENV_IS_IN_NAND ENVL_NAND, #endif diff --git a/package/boot/uboot-mediatek/patches/100-12-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch b/package/boot/uboot-mediatek/patches/100-12-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch index a7dca579784..589ed7d10c8 100644 --- a/package/boot/uboot-mediatek/patches/100-12-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch +++ b/package/boot/uboot-mediatek/patches/100-12-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch @@ -114,7 +114,7 @@ Signed-off-by: Weijie Gao static int spi_nor_hwcaps2cmd(u32 hwcaps, const int table[][2], size_t size) { size_t i; -@@ -4486,6 +4580,7 @@ int spi_nor_scan(struct spi_nor *nor) +@@ -4488,6 +4582,7 @@ int spi_nor_scan(struct spi_nor *nor) nor->write = spi_nor_write_data; nor->read_reg = spi_nor_read_reg; nor->write_reg = spi_nor_write_reg; diff --git a/package/boot/uboot-mediatek/patches/100-17-board-mt7981-add-reference-board-using-new-spi-nand-.patch b/package/boot/uboot-mediatek/patches/100-17-board-mt7981-add-reference-board-using-new-spi-nand-.patch index ef67d4a77fe..42153605a0f 100644 --- a/package/boot/uboot-mediatek/patches/100-17-board-mt7981-add-reference-board-using-new-spi-nand-.patch +++ b/package/boot/uboot-mediatek/patches/100-17-board-mt7981-add-reference-board-using-new-spi-nand-.patch @@ -18,7 +18,7 @@ Signed-off-by: Weijie Gao --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1119,6 +1119,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1121,6 +1121,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7622-bananapi-bpi-r64.dtb \ mt7623n-bananapi-bpi-r2.dtb \ mt7981-rfb.dtb \ @@ -163,7 +163,7 @@ Signed-off-by: Weijie Gao +}; --- /dev/null +++ b/configs/mt7981_snfi_nand_rfb_defconfig -@@ -0,0 +1,57 @@ +@@ -0,0 +1,58 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -173,6 +173,7 @@ Signed-off-by: Weijie Gao +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x20000 +CONFIG_DEFAULT_DEVICE_TREE="mt7981-snfi-nand-rfb" ++# CONFIG_BOARD_INIT is not set +CONFIG_SYS_PROMPT="MT7981> " +CONFIG_TARGET_MT7981=y +CONFIG_DEBUG_UART_BASE=0x11002000 diff --git a/package/boot/uboot-mediatek/patches/100-22-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch b/package/boot/uboot-mediatek/patches/100-22-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch index 150ba69bea5..74474392a39 100644 --- a/package/boot/uboot-mediatek/patches/100-22-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch +++ b/package/boot/uboot-mediatek/patches/100-22-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch @@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig -@@ -879,6 +879,14 @@ config MMC_MTK +@@ -862,6 +862,14 @@ config MMC_MTK This is needed if support for any SD/SDIO/MMC devices is required. If unsure, say N. @@ -32,7 +32,7 @@ Signed-off-by: Weijie Gao config FSL_SDHC_V2_3 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile -@@ -86,3 +86,7 @@ obj-$(CONFIG_RENESAS_SDHI) += tmio-comm +@@ -84,3 +84,7 @@ obj-$(CONFIG_RENESAS_SDHI) += tmio-comm obj-$(CONFIG_MMC_BCM2835) += bcm2835_sdhost.o obj-$(CONFIG_MMC_MTK) += mtk-sd.o obj-$(CONFIG_MMC_SDHCI_F_SDH30) += f_sdh30.o diff --git a/package/boot/uboot-mediatek/patches/100-25-env-ubi-add-support-to-create-environment-volume-if-.patch b/package/boot/uboot-mediatek/patches/100-25-env-ubi-add-support-to-create-environment-volume-if-.patch index d9d00c33189..ea05f783a7d 100644 --- a/package/boot/uboot-mediatek/patches/100-25-env-ubi-add-support-to-create-environment-volume-if-.patch +++ b/package/boot/uboot-mediatek/patches/100-25-env-ubi-add-support-to-create-environment-volume-if-.patch @@ -14,7 +14,7 @@ Signed-off-by: Weijie Gao --- a/env/Kconfig +++ b/env/Kconfig -@@ -687,6 +687,12 @@ config ENV_UBI_VOLUME_REDUND +@@ -703,6 +703,12 @@ config ENV_UBI_VOLUME_REDUND help Name of the redundant volume that you want to store the environment in. @@ -30,7 +30,7 @@ Signed-off-by: Weijie Gao --- a/env/ubi.c +++ b/env/ubi.c @@ -105,6 +105,18 @@ static int env_ubi_save(void) - #endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */ + #endif /* CONFIG_ENV_REDUNDANT */ #endif /* CONFIG_CMD_SAVEENV */ +int __weak env_ubi_volume_create(const char *volume) @@ -45,7 +45,7 @@ Signed-off-by: Weijie Gao + UBI_VOL_NUM_AUTO, false); +} + - #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT + #ifdef CONFIG_ENV_REDUNDANT static int env_ubi_load(void) { @@ -134,6 +146,11 @@ static int env_ubi_load(void) diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch index 085491c371b..8d4ce8f3a76 100644 --- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch +++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch @@ -1,6 +1,6 @@ --- a/configs/mt7988_sd_rfb_defconfig +++ b/configs/mt7988_sd_rfb_defconfig -@@ -5,37 +5,76 @@ CONFIG_ARCH_MEDIATEK=y +@@ -5,38 +5,77 @@ CONFIG_ARCH_MEDIATEK=y CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 @@ -28,6 +28,7 @@ CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_LOG=y + # CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_PROMPT="MT7988> " +CONFIG_CMD_CPU=y @@ -73,15 +74,15 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_NETMASK=y -@@ -44,28 +83,43 @@ CONFIG_USE_SERVERIP=y +@@ -45,28 +84,43 @@ CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.1.2" CONFIG_PROT_TCP=y CONFIG_NET_RANDOM_ETHADDR=y @@ -130,7 +131,7 @@ CONFIG_HEXDUMP=y --- a/configs/mt7988_rfb_defconfig +++ b/configs/mt7988_rfb_defconfig -@@ -6,36 +6,76 @@ CONFIG_TEXT_BASE=0x41e00000 +@@ -6,37 +6,77 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7988-rfb" @@ -155,6 +156,7 @@ CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_LOG=y + # CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_PROMPT="MT7988> " +CONFIG_CMD_CPU=y @@ -201,18 +203,18 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_NETMASK=y -@@ -44,9 +84,13 @@ CONFIG_USE_SERVERIP=y +@@ -45,9 +85,13 @@ CONFIG_USE_SERVERIP=y CONFIG_SERVERIP="192.168.1.2" CONFIG_PROT_TCP=y CONFIG_NET_RANDOM_ETHADDR=y @@ -228,7 +230,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_MTD=y -@@ -64,20 +108,31 @@ CONFIG_SPI_FLASH_WINBOND=y +@@ -65,20 +109,31 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XMC=y CONFIG_SPI_FLASH_XTX=y CONFIG_SPI_FLASH_MTD=y diff --git a/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch b/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch index ab7ed5c98dc..e45ae006c7a 100644 --- a/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch +++ b/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch @@ -1,6 +1,6 @@ --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -30,6 +30,9 @@ CONFIG_CMD_MTD=y +@@ -31,6 +31,9 @@ CONFIG_CMD_MTD=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y @@ -18,9 +18,9 @@ CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="mt7981-snfi-nand-rfb" + # CONFIG_BOARD_INIT is not set CONFIG_SYS_PROMPT="MT7981> " - CONFIG_TARGET_MT7981=y -@@ -30,8 +29,6 @@ CONFIG_CMD_GPIO=y +@@ -31,8 +30,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MTD=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y @@ -29,14 +29,14 @@ CONFIG_CMD_UBI=y CONFIG_CMD_UBI_RENAME=y CONFIG_ENV_OVERWRITE=y -@@ -55,3 +52,4 @@ CONFIG_MTK_POWER_DOMAIN=y +@@ -56,3 +53,4 @@ CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_HEXDUMP=y +CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7981_nor_rfb_defconfig -@@ -0,0 +1,68 @@ +@@ -0,0 +1,69 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -45,6 +45,7 @@ +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" ++# CONFIG_BOARD_INIT is not set +CONFIG_SYS_PROMPT="MT7981> " +CONFIG_TARGET_MT7981=y +CONFIG_DEBUG_UART_BASE=0x11002000 diff --git a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch index 145e8c37ea0..3b1f9b55d3e 100644 --- a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch +++ b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch @@ -1,6 +1,6 @@ --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig -@@ -8,37 +8,56 @@ CONFIG_NR_DRAM_BANKS=1 +@@ -8,38 +8,57 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7981-emmc-rfb" @@ -20,6 +20,7 @@ CONFIG_SYS_PBSIZE=1049 CONFIG_LOGLEVEL=7 CONFIG_LOG=y + # CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_PROMPT="MT7981> " +CONFIG_CMD_CPU=y @@ -63,7 +64,7 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y -@@ -46,7 +65,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +@@ -47,7 +66,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -77,7 +78,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_PHY_FIXED=y -@@ -59,6 +84,7 @@ CONFIG_MTK_POWER_DOMAIN=y +@@ -60,6 +85,7 @@ CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_SERIAL=y @@ -87,7 +88,7 @@ CONFIG_HEXDUMP=y --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -6,38 +6,78 @@ CONFIG_TEXT_BASE=0x41e00000 +@@ -6,39 +6,79 @@ CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" @@ -106,6 +107,7 @@ CONFIG_SYS_PBSIZE=1049 CONFIG_LOGLEVEL=7 CONFIG_LOG=y + # CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MT7981> " @@ -149,11 +151,11 @@ CONFIG_CMD_UBI_RENAME=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y @@ -168,7 +170,7 @@ # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y -@@ -62,6 +102,7 @@ CONFIG_PINCTRL_MT7981=y +@@ -63,6 +103,7 @@ CONFIG_PINCTRL_MT7981=y CONFIG_POWER_DOMAIN=y CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_SERIAL=y @@ -178,7 +180,7 @@ CONFIG_DM_SPI=y --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig -@@ -8,37 +8,56 @@ CONFIG_NR_DRAM_BANKS=1 +@@ -8,38 +8,57 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x80000 CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="mt7981-sd-rfb" @@ -198,6 +200,7 @@ CONFIG_SYS_PBSIZE=1049 CONFIG_LOGLEVEL=7 CONFIG_LOG=y + # CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_PROMPT="MT7981> " +CONFIG_CMD_CPU=y @@ -241,7 +244,7 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y -@@ -46,7 +65,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +@@ -47,7 +66,13 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y @@ -255,7 +258,7 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_PHY_FIXED=y -@@ -59,6 +84,7 @@ CONFIG_MTK_POWER_DOMAIN=y +@@ -60,6 +85,7 @@ CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_SERIAL=y @@ -265,10 +268,10 @@ CONFIG_HEXDUMP=y --- a/configs/mt7981_snfi_nand_rfb_defconfig +++ b/configs/mt7981_snfi_nand_rfb_defconfig -@@ -6,37 +6,73 @@ CONFIG_TEXT_BASE=0x41e00000 - CONFIG_SYS_MALLOC_F_LEN=0x4000 +@@ -7,37 +7,73 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEFAULT_DEVICE_TREE="mt7981-snfi-nand-rfb" + # CONFIG_BOARD_INIT is not set -CONFIG_SYS_PROMPT="MT7981> " +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_TARGET_MT7981=y @@ -327,11 +330,11 @@ CONFIG_CMD_UBI_RENAME=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y @@ -346,7 +349,7 @@ # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y -@@ -50,6 +86,6 @@ CONFIG_PINCTRL_MT7981=y +@@ -51,6 +87,6 @@ CONFIG_PINCTRL_MT7981=y CONFIG_POWER_DOMAIN=y CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_SERIAL=y @@ -356,13 +359,14 @@ -CONFIG_LMB_MAX_REGIONS=64 --- a/configs/mt7981_nor_rfb_defconfig +++ b/configs/mt7981_nor_rfb_defconfig -@@ -5,37 +5,73 @@ CONFIG_ARCH_MEDIATEK=y +@@ -5,38 +5,74 @@ CONFIG_ARCH_MEDIATEK=y CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="mt7981-rfb" + # CONFIG_BOARD_INIT is not set -CONFIG_SYS_PROMPT="MT7981> " +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_TARGET_MT7981=y @@ -420,8 +424,8 @@ +CONFIG_CMD_FS_UUID=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="u-boot-env" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y @@ -437,7 +441,7 @@ # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y -@@ -60,9 +96,9 @@ CONFIG_PINCTRL_MT7981=y +@@ -61,9 +97,9 @@ CONFIG_PINCTRL_MT7981=y CONFIG_POWER_DOMAIN=y CONFIG_MTK_POWER_DOMAIN=y CONFIG_DM_SERIAL=y diff --git 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 index 69294532506..3c6e879bb5e 100644 --- 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 @@ --- a/Makefile +++ b/Makefile -@@ -1094,7 +1094,7 @@ quiet_cmd_pad_cat = CAT $@ +@@ -1298,7 +1298,7 @@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || { rm -f $@; false; } quiet_cmd_lzma = LZMA $@ diff --git a/package/boot/uboot-mediatek/patches/129-board-mediatek-wire-up-NMBM-support.patch b/package/boot/uboot-mediatek/patches/129-board-mediatek-wire-up-NMBM-support.patch index fc3d6b0b91a..011122202d4 100644 --- a/package/boot/uboot-mediatek/patches/129-board-mediatek-wire-up-NMBM-support.patch +++ b/package/boot/uboot-mediatek/patches/129-board-mediatek-wire-up-NMBM-support.patch @@ -12,7 +12,7 @@ Subject: [PATCH] board: mediatek: wire-up NMBM support --- a/board/mediatek/mt7622/mt7622_rfb.c +++ b/board/mediatek/mt7622/mt7622_rfb.c -@@ -9,9 +9,47 @@ +@@ -9,4 +9,42 @@ #include #include @@ -22,11 +22,6 @@ Subject: [PATCH] board: mediatek: wire-up NMBM support +#include + DECLARE_GLOBAL_DATA_PTR; - - int board_init(void) - { - return 0; - } + +int board_nmbm_init(void) +{ @@ -113,34 +108,15 @@ Subject: [PATCH] board: mediatek: wire-up NMBM support +} --- a/board/mediatek/mt7981/mt7981_rfb.c +++ b/board/mediatek/mt7981/mt7981_rfb.c -@@ -4,7 +4,57 @@ +@@ -4,3 +4,38 @@ * Author: Sam Shih */ -+#include -+#include -+#include -+#include -+ +#include +#include +#include +#include + -+DECLARE_GLOBAL_DATA_PTR; -+ - int board_init(void) - { - return 0; - } -+ -+int board_late_init(void) -+{ -+ gd->env_valid = 1; //to load environment variable from persistent store -+ env_relocate(); -+ return 0; -+} -+ +int board_nmbm_init(void) +{ +#ifdef CONFIG_ENABLE_NAND_NMBM @@ -173,34 +149,15 @@ Subject: [PATCH] board: mediatek: wire-up NMBM support +} --- a/board/mediatek/mt7986/mt7986_rfb.c +++ b/board/mediatek/mt7986/mt7986_rfb.c -@@ -4,7 +4,59 @@ +@@ -4,3 +4,40 @@ * Author: Sam Shih */ -+#include -+#include -+#include -+#include -+ +#include +#include +#include +#include + -+DECLARE_GLOBAL_DATA_PTR; -+ - int board_init(void) - { - return 0; - } -+ -+int board_late_init(void) -+{ -+ gd->env_valid = 1; //to load environment variable from persistent store -+ env_relocate(); -+ return 0; -+} -+ +int board_nmbm_init(void) +{ +#ifdef CONFIG_ENABLE_NAND_NMBM diff --git a/package/boot/uboot-mediatek/patches/130-01-env-mtd-add-the-missing-put_mtd_device.patch b/package/boot/uboot-mediatek/patches/130-01-env-mtd-add-the-missing-put_mtd_device.patch deleted file mode 100644 index 61c4b6e8b1c..00000000000 --- a/package/boot/uboot-mediatek/patches/130-01-env-mtd-add-the-missing-put_mtd_device.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0508c8e120d275d994e6099eb9c60bfaec0c3f5f Mon Sep 17 00:00:00 2001 -From: Shiji Yang -Date: Mon, 21 Jul 2025 21:32:16 +0800 -Subject: [PATCH 1/2] env: mtd: add the missing put_mtd_device() - -The mtd device is got in setup_mtd_device(), we must put the mtd -device before exiting the function to update the mtd use count. This -patch fixes the following env error: - -> Removing MTD device #2 (u-boot-env) with use count 1 -> Error when deleting partition "u-boot-env" (-16) - -Fixes: 03fb08d4aef8 ("env: Introduce support for MTD") -Signed-off-by: Shiji Yang ---- - env/mtd.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/env/mtd.c -+++ b/env/mtd.c -@@ -131,6 +131,8 @@ static int env_mtd_save(void) - puts("done\n"); - - done: -+ put_mtd_device(mtd_env); -+ - if (saved_buf) - free(saved_buf); - -@@ -188,6 +190,8 @@ static int env_mtd_load(void) - gd->env_valid = ENV_VALID; - - out: -+ put_mtd_device(mtd_env); -+ - free(buf); - - return ret; -@@ -280,6 +284,8 @@ static int env_mtd_erase(void) - ret = 0; - - done: -+ put_mtd_device(mtd_env); -+ - if (saved_buf) - free(saved_buf); - diff --git a/package/boot/uboot-mediatek/patches/130-02-env-mtd-initialize-saved_buf-pointer.patch b/package/boot/uboot-mediatek/patches/130-02-env-mtd-initialize-saved_buf-pointer.patch deleted file mode 100644 index 206d3b3560f..00000000000 --- a/package/boot/uboot-mediatek/patches/130-02-env-mtd-initialize-saved_buf-pointer.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0ef932f509fd9f9215af2ea4ca2919d3285ddf60 Mon Sep 17 00:00:00 2001 -From: Shiji Yang -Date: Thu, 24 Jul 2025 07:50:40 +0800 -Subject: [PATCH 2/2] env: mtd: initialize saved_buf pointer - -When sect_size is greater than CONFIG_ENV_SIZE, this wild -pointer will cause CPU halt or system crash. - -Fixes: 03fb08d4aef8 ("env: Introduce support for MTD") -Signed-off-by: Shiji Yang ---- - env/mtd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/env/mtd.c -+++ b/env/mtd.c -@@ -201,7 +201,7 @@ static int env_mtd_erase(void) - { - struct mtd_info *mtd_env; - u32 sect_size, sect_num; -- char *saved_buf, *tmp; -+ char *saved_buf = NULL, *tmp; - struct erase_info ei; - size_t ret_len; - int remaining; diff --git a/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch b/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch index 191185f35ec..2dbe461c56a 100644 --- a/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch +++ b/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch @@ -58,7 +58,7 @@ Signed-off-by: Weijie Gao --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -79,6 +79,37 @@ config PHY_ADIN +@@ -82,6 +82,37 @@ config PHY_ADIN help Add support for configuring RGMII on Analog Devices ADIN PHYs. diff --git a/package/boot/uboot-mediatek/patches/170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch b/package/boot/uboot-mediatek/patches/170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch deleted file mode 100644 index a06682a0b89..00000000000 --- a/package/boot/uboot-mediatek/patches/170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 16fd9af92b7ed93ece62fa8d1bef341455d773cf Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Sat, 24 May 2025 23:23:53 +0200 -Subject: [PATCH v2] cmd: bootmenu: permit to select bootmenu entry with a - shortcut - -Permit to select a bootmenu entry with a key shortcut. This is -especially useful in production or testing scenario to automate flashing -procedure or testing procedure. - -The boot entry are changed to append the shortcut key to it. - -Example: - 1. Run default boot command. - 2. Boot system via TFTP. - 3. Boot production system from NAND. - 4. Boot recovery system from NAND. - 5. Load production system via TFTP then write to NAND. - 6. Load recovery system via TFTP then write to NAND. - 7. Load BL31+U-Boot FIP via TFTP then write to NAND. - 8. Load BL2 preloader via TFTP then write to NAND. - 9. Reboot. - a. Reset all settings to factory defaults. - 0. Exit - -0 is always reserved for Exit to console. -On pressing the keyboard key 2, the bootmenu entry 2 is selected and -executed. - -Up to 34 key shortcut (0 excluded as reserved) are supported from 1-9 -and a-z. -If a shortcut key not present in the bootmenu list is pressed, it is -simply ignored and eventually the autoboot is interrupted. - -Capital A-Z are converted to lower a-z and the related option is -selected. - -Suggested-by: Weijie Gao -Signed-off-by: Christian Marangi ---- -Changes v2: -- Fix spelling mistake -- Fix case with '0' - - cmd/bootmenu.c | 41 ++++++++++++++++++++++++++++++++++++++--- - common/menu.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- - include/cli.h | 2 ++ - include/menu.h | 3 +++ - 4 files changed, 85 insertions(+), 5 deletions(-) - ---- a/cmd/bootmenu.c -+++ b/cmd/bootmenu.c -@@ -114,6 +114,14 @@ static char *bootmenu_choice_entry(void - ++menu->active; - /* no menu key selected, regenerate menu */ - return NULL; -+ case BKEY_SHORTCUT: -+ /* invalid shortcut, regenerate menu */ -+ if (cch->shortcut_key >= menu->count - 1) -+ return NULL; -+ /* shortcut_key value for Exit is is -1 */ -+ menu->active = cch->shortcut_key < 0 ? menu->count - 1 : -+ cch->shortcut_key; -+ fallthrough; - case BKEY_SELECT: - iter = menu->first; - for (i = 0; i < menu->active; ++i) -@@ -161,6 +169,21 @@ static void bootmenu_destroy(struct boot - free(menu); - } - -+static char bootmenu_entry_shortcut_key(int index) -+{ -+ switch (index) { -+ /* 1-9 shortcut key (0 reserved) */ -+ case 0 ... 8: -+ return '1' + index; -+ /* a-z shortcut key */ -+ case 9 ... 34: -+ return 'a' + index - 9; -+ /* We support shortcut for up to 34 options (0 reserved) */ -+ default: -+ return -ENOENT; -+ } -+} -+ - /** - * prepare_bootmenu_entry() - generate the bootmenu_xx entries - * -@@ -184,6 +207,8 @@ static int prepare_bootmenu_entry(struct - struct bootmenu_entry *iter = *current; - - while ((option = bootmenu_getoption(i))) { -+ char shortcut_key; -+ int len; - - /* bootmenu_[num] format is "[title]=[commands]" */ - sep = strchr(option, '='); -@@ -196,12 +221,22 @@ static int prepare_bootmenu_entry(struct - if (!entry) - return -ENOMEM; - -- entry->title = strndup(option, sep - option); -+ /* Add shotcut key option: %c. %s\0 */ -+ len = sep - option + 4; -+ -+ entry->title = malloc(len); - if (!entry->title) { - free(entry); - return -ENOMEM; - } - -+ shortcut_key = bootmenu_entry_shortcut_key(i); -+ /* Use emtpy space if entry doesn't support shortcut key */ -+ snprintf(entry->title, len, "%c%c %s", -+ shortcut_key > 0 ? shortcut_key : ' ', -+ shortcut_key > 0 ? '.' : ' ', -+ option); -+ - entry->command = strdup(sep + 1); - if (!entry->command) { - free(entry->title); -@@ -388,9 +423,9 @@ static struct bootmenu_data *bootmenu_cr - - /* Add Quit entry if exiting bootmenu is disabled */ - if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) -- entry->title = strdup("Exit"); -+ entry->title = strdup("0. Exit"); - else -- entry->title = strdup("Quit"); -+ entry->title = strdup("0. Quit"); - - if (!entry->title) { - free(entry); ---- a/common/menu.c -+++ b/common/menu.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -436,6 +437,29 @@ int menu_destroy(struct menu *m) - return 1; - } - -+static int bootmenu_conv_shortcut_key(struct bootmenu_data *menu, int ichar) -+{ -+ int shortcut_key; -+ -+ ichar = tolower(ichar); -+ switch (ichar) { -+ /* a-z for bootmenu entry > 9 */ -+ case 'a' ... 'z': -+ shortcut_key = ichar - 'a' + 9; -+ break; -+ /* 1-9 for bootmenu entry <= 9 */ -+ case '1' ... '9': -+ shortcut_key = ichar - '1'; -+ break; -+ /* Reserve 0 for last option (aka Exit) */ -+ case '0': -+ default: -+ return -1; -+ } -+ -+ return shortcut_key; -+} -+ - enum bootmenu_key bootmenu_autoboot_loop(struct bootmenu_data *menu, - struct cli_ch_state *cch) - { -@@ -443,12 +467,12 @@ enum bootmenu_key bootmenu_autoboot_loop - int i, c; - - while (menu->delay > 0) { -+ int ichar; -+ - if (ansi) - printf(ANSI_CURSOR_POSITION, menu->count + 5, 3); - printf("Hit any key to stop autoboot: %d ", menu->delay); - for (i = 0; i < 100; ++i) { -- int ichar; -- - if (!tstc()) { - schedule(); - mdelay(10); -@@ -470,6 +494,11 @@ enum bootmenu_key bootmenu_autoboot_loop - case 0x3: /* ^C */ - key = BKEY_QUIT; - break; -+ case 'A' ... 'Z': -+ case 'a' ... 'z': -+ case '0' ... '9': -+ key = BKEY_SHORTCUT; -+ break; - default: - key = BKEY_NONE; - break; -@@ -477,6 +506,9 @@ enum bootmenu_key bootmenu_autoboot_loop - break; - } - -+ if (key == BKEY_SHORTCUT) -+ cch->shortcut_key = bootmenu_conv_shortcut_key(menu, ichar); -+ - if (menu->delay < 0) - break; - -@@ -524,6 +556,11 @@ enum bootmenu_key bootmenu_conv_key(int - case ' ': - key = BKEY_SPACE; - break; -+ case 'A' ... 'Z': -+ case 'a' ... 'z': -+ case '0' ... '9': -+ key = BKEY_SHORTCUT; -+ break; - default: - key = BKEY_NONE; - break; -@@ -554,5 +591,8 @@ enum bootmenu_key bootmenu_loop(struct b - - key = bootmenu_conv_key(c); - -+ if (key == BKEY_SHORTCUT) -+ cch->shortcut_key = bootmenu_conv_shortcut_key(menu, c); -+ - return key; - } ---- a/include/cli.h -+++ b/include/cli.h -@@ -17,12 +17,14 @@ - * @esc_save: Escape characters collected so far - * @emit_upto: Next index to emit from esc_save - * @emitting: true if emitting from esc_save -+ * @shortcut_key: Selected shortcut option index - */ - struct cli_ch_state { - int esc_len; - char esc_save[8]; - int emit_upto; - bool emitting; -+ int shortcut_key; - }; - - /** ---- a/include/menu.h -+++ b/include/menu.h -@@ -54,6 +54,9 @@ enum bootmenu_key { - BKEY_QUIT, - BKEY_SAVE, - -+ /* shortcut key to select menu option directly */ -+ BKEY_SHORTCUT, -+ - /* 'extra' keys, which are used by menus but not cedit */ - BKEY_PLUS, - BKEY_MINUS, diff --git 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 index 9872ccbf268..6d7d8f0b43a 100644 --- 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 @@ -129,7 +129,7 @@ int arch, int ph_type, int bootstage_id, --- a/include/image.h +++ b/include/image.h -@@ -1113,6 +1113,7 @@ int fit_parse_subimage(const char *spec, +@@ -1114,6 +1114,7 @@ int fit_parse_subimage(const char *spec, ulong *addr, const char **image_name); int fit_get_subimage_count(const void *fit, int images_noffset); diff --git a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch index c5ec8ba1fd2..7d4018a1a4d 100644 --- 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 @@ --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -709,6 +709,12 @@ config CMD_ENV_EXISTS +@@ -715,6 +715,12 @@ config CMD_ENV_EXISTS Check if a variable is defined in the environment for use in shell scripting. diff --git a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch b/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch index a93f7655e0e..aa4a2529092 100644 --- a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch +++ b/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch @@ -16,7 +16,7 @@ Reviewed-by: Tom Rini --- a/boot/image-fdt.c +++ b/boot/image-fdt.c -@@ -614,6 +614,12 @@ int image_setup_libfdt(struct bootm_head +@@ -631,6 +631,12 @@ int image_setup_libfdt(struct bootm_head images->fit_uname_cfg, strlen(images->fit_uname_cfg) + 1, 1); diff --git a/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch index 158420d37a8..ca1a101eede 100644 --- a/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch +++ b/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch @@ -17,9 +17,9 @@ #include #include -@@ -21,6 +28,28 @@ int board_init(void) - return 0; - } +@@ -16,6 +23,28 @@ + + DECLARE_GLOBAL_DATA_PTR; +int board_late_init(void) +{ @@ -39,9 +39,9 @@ + } + } + -+ env_relocate(); -+ return 0; -+ } ++ env_relocate(); ++ return 0; ++} + int board_nmbm_init(void) { diff --git a/package/boot/uboot-mediatek/patches/303-mt7986-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/303-mt7986-generic-reset-button-ignore-env.patch index 01b4b52952f..d2f85c152b9 100644 --- a/package/boot/uboot-mediatek/patches/303-mt7986-generic-reset-button-ignore-env.patch +++ b/package/boot/uboot-mediatek/patches/303-mt7986-generic-reset-button-ignore-env.patch @@ -1,27 +1,26 @@ --- a/board/mediatek/mt7986/mt7986_rfb.c +++ b/board/mediatek/mt7986/mt7986_rfb.c -@@ -5,9 +5,16 @@ +@@ -4,11 +4,43 @@ + * Author: Sam Shih */ - #include ++#include +#include +#include - #include - #include - #include ++#include ++#include +#include -+ -+#ifndef CONFIG_RESET_BUTTON_LABEL -+#define CONFIG_RESET_BUTTON_LABEL "reset" -+#endif - #include #include -@@ -23,7 +30,22 @@ int board_init(void) + #include + #include - int board_late_init(void) - { -- gd->env_valid = 1; //to load environment variable from persistent store ++#ifndef CONFIG_RESET_BUTTON_LABEL ++#define CONFIG_RESET_BUTTON_LABEL "reset" ++#endif ++ ++int board_late_init(void) ++{ + struct udevice *dev; + + gd->env_valid = ENV_VALID; @@ -38,6 +37,10 @@ + gd->env_valid = ENV_INVALID; + } + } - env_relocate(); - return 0; - } ++ env_relocate(); ++ return 0; ++} ++ + int board_nmbm_init(void) + { + #ifdef CONFIG_ENABLE_NAND_NMBM diff --git a/package/boot/uboot-mediatek/patches/304-mt7981-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/304-mt7981-generic-reset-button-ignore-env.patch index b3ac2aa27f1..191ca0baea9 100644 --- a/package/boot/uboot-mediatek/patches/304-mt7981-generic-reset-button-ignore-env.patch +++ b/package/boot/uboot-mediatek/patches/304-mt7981-generic-reset-button-ignore-env.patch @@ -1,27 +1,26 @@ --- a/board/mediatek/mt7981/mt7981_rfb.c +++ b/board/mediatek/mt7981/mt7981_rfb.c -@@ -5,9 +5,16 @@ +@@ -4,11 +4,43 @@ + * Author: Sam Shih */ - #include ++#include +#include +#include - #include - #include - #include ++#include ++#include +#include -+ -+#ifndef CONFIG_RESET_BUTTON_LABEL -+#define CONFIG_RESET_BUTTON_LABEL "reset" -+#endif - #include #include -@@ -23,7 +30,22 @@ int board_init(void) + #include + #include - int board_late_init(void) - { -- gd->env_valid = 1; //to load environment variable from persistent store ++#ifndef CONFIG_RESET_BUTTON_LABEL ++#define CONFIG_RESET_BUTTON_LABEL "reset" ++#endif ++ ++int board_late_init(void) ++{ + struct udevice *dev; + + gd->env_valid = ENV_VALID; @@ -38,6 +37,10 @@ + gd->env_valid = ENV_INVALID; + } + } - env_relocate(); - return 0; - } ++ env_relocate(); ++ return 0; ++} ++ + int board_nmbm_init(void) + { + #ifdef CONFIG_ENABLE_NAND_NMBM diff --git a/package/boot/uboot-mediatek/patches/305-mt7988-generic-reset-button-ignore-env.patch b/package/boot/uboot-mediatek/patches/305-mt7988-generic-reset-button-ignore-env.patch index 3f239c984a7..aeb39819cf1 100644 --- a/package/boot/uboot-mediatek/patches/305-mt7988-generic-reset-button-ignore-env.patch +++ b/package/boot/uboot-mediatek/patches/305-mt7988-generic-reset-button-ignore-env.patch @@ -1,6 +1,6 @@ --- a/board/mediatek/mt7988/mt7988_rfb.c +++ b/board/mediatek/mt7988/mt7988_rfb.c -@@ -4,7 +4,42 @@ +@@ -4,3 +4,37 @@ * Author: Sam Shih */ @@ -15,11 +15,6 @@ +#ifndef CONFIG_RESET_BUTTON_LABEL +#define CONFIG_RESET_BUTTON_LABEL "reset" +#endif -+ - int board_init(void) - { - return 0; - } + +int board_late_init(void) +{ diff --git a/package/boot/uboot-mediatek/patches/310-mt7988-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/310-mt7988-select-rootdisk.patch index 308108e621d..3a44dcd8dca 100644 --- a/package/boot/uboot-mediatek/patches/310-mt7988-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/310-mt7988-select-rootdisk.patch @@ -10,7 +10,7 @@ #ifndef CONFIG_RESET_BUTTON_LABEL #define CONFIG_RESET_BUTTON_LABEL "reset" -@@ -43,3 +45,54 @@ int board_late_init(void) +@@ -38,3 +40,54 @@ int board_late_init(void) env_relocate(); return 0; } diff --git a/package/boot/uboot-mediatek/patches/311-mt7986-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/311-mt7986-select-rootdisk.patch index 3588dc2a881..535190b0463 100644 --- a/package/boot/uboot-mediatek/patches/311-mt7986-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/311-mt7986-select-rootdisk.patch @@ -1,16 +1,16 @@ --- a/board/mediatek/mt7986/mt7986_rfb.c +++ b/board/mediatek/mt7986/mt7986_rfb.c -@@ -10,7 +10,9 @@ +@@ -9,7 +9,9 @@ + #include #include #include - #include +#include #include +#include - - #ifndef CONFIG_RESET_BUTTON_LABEL - #define CONFIG_RESET_BUTTON_LABEL "reset" -@@ -82,3 +84,54 @@ int board_nmbm_init(void) + #include + #include + #include +@@ -73,3 +75,54 @@ int board_nmbm_init(void) return 0; } diff --git a/package/boot/uboot-mediatek/patches/312-mt7622-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/312-mt7622-select-rootdisk.patch index 44caf8465cb..586015cd0d2 100644 --- a/package/boot/uboot-mediatek/patches/312-mt7622-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/312-mt7622-select-rootdisk.patch @@ -10,7 +10,7 @@ #ifndef CONFIG_RESET_BUTTON_LABEL #define CONFIG_RESET_BUTTON_LABEL "reset" -@@ -21,10 +23,43 @@ +@@ -21,8 +23,46 @@ #include #include @@ -41,8 +41,8 @@ +static int gpio_mode0; +static int msdc_int; + - int board_init(void) - { ++int board_init(void) ++{ + /* + * Save content of GPIO_MODE0 as left behind by the BootROM. + * Also grab MSDC1 INT status to see if BootROM has been reading @@ -51,10 +51,13 @@ + */ + gpio_mode0 = readl(MT7622_GPIO_MODE0); + msdc_int = readl(MT7622_MSDC_INT); - return 0; - } - -@@ -82,3 +117,84 @@ int board_nmbm_init(void) ++ return 0; ++} ++ + int board_late_init(void) + { + struct udevice *dev; +@@ -77,3 +117,84 @@ int board_nmbm_init(void) return 0; } @@ -139,3 +142,13 @@ + + return 0; +} +--- a/configs/mt7622_rfb_defconfig ++++ b/configs/mt7622_rfb_defconfig +@@ -16,7 +16,6 @@ CONFIG_DEFAULT_FDT_FILE="mt7622-rfb" + CONFIG_SYS_PBSIZE=1049 + CONFIG_LOGLEVEL=7 + CONFIG_LOG=y +-# CONFIG_BOARD_INIT is not set + CONFIG_SYS_PROMPT="MT7622> " + CONFIG_SYS_MAXARGS=8 + CONFIG_CMD_BOOTMENU=y diff --git a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch index 73323f0b2a8..de20f67f74f 100644 --- a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch @@ -1,16 +1,16 @@ --- a/board/mediatek/mt7981/mt7981_rfb.c +++ b/board/mediatek/mt7981/mt7981_rfb.c -@@ -10,7 +10,9 @@ +@@ -9,7 +9,9 @@ + #include #include #include - #include +#include #include +#include - - #ifndef CONFIG_RESET_BUTTON_LABEL - #define CONFIG_RESET_BUTTON_LABEL "reset" -@@ -80,3 +82,54 @@ int board_nmbm_init(void) + #include + #include + #include +@@ -71,3 +73,54 @@ int board_nmbm_init(void) return 0; } diff --git a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch index c0ed24d0893..45f73048276 100644 --- a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch @@ -63,9 +63,9 @@ +CONFIG_CMD_FS_UUID=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r2_env" + CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r2_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch index 109c5b0cf02..ae0ddebc59e 100644 --- a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch @@ -61,9 +61,9 @@ +CONFIG_CMD_FS_UUID=y +CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/unielec_u7623-02_env" + CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/unielec_u7623-02_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y +CONFIG_NETCONSOLE=y diff --git 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 index b8e50fc13fe..707ab9c4f9b 100644 --- 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 @@ -70,11 +70,11 @@ +CONFIG_CMD_UBI=y +CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SYS_MMC_ENV_DEV=1 -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-sdmmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_MMC_DEVICE_INDEX=1 ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r64-sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -282,10 +282,10 @@ +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_FS_UUID=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r64-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -453,13 +453,13 @@ +CONFIG_CMD_UBI=y +CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-snand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r64-snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y diff --git a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch index 8425b15bc16..ecd4012cb1e 100644 --- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch +++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch @@ -60,13 +60,13 @@ +CONFIG_CMD_UBI=y +CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/linksys_e8450_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/linksys_e8450_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -331,7 +331,7 @@ +}; --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1117,6 +1117,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1119,6 +1119,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7622-rfb.dtb \ mt7623a-unielec-u7623-02-emmc.dtb \ mt7622-bananapi-bpi-r64.dtb \ diff --git 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 index 42654b7a0f2..452298edfdc 100644 --- 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 @@ -56,10 +56,10 @@ +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)" +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="nor0" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/ubnt_unifi-6-lr_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -172,10 +172,10 @@ +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)" +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="nor0" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr-v2_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/ubnt_unifi-6-lr-v2_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -288,10 +288,10 @@ +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)" +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="nor0" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/ubnt_unifi-6-lr_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -739,7 +739,7 @@ +}; --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1118,6 +1118,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1120,6 +1120,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7623a-unielec-u7623-02-emmc.dtb \ mt7622-bananapi-bpi-r64.dtb \ mt7622-linksys-e8450-ubi.dtb \ @@ -909,7 +909,7 @@ +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- a/common/board_r.c +++ b/common/board_r.c -@@ -67,6 +67,7 @@ +@@ -66,6 +66,7 @@ #include #include #include @@ -917,7 +917,7 @@ DECLARE_GLOBAL_DATA_PTR; -@@ -423,6 +424,20 @@ static int initr_onenand(void) +@@ -422,6 +423,20 @@ static int initr_onenand(void) } #endif @@ -938,7 +938,7 @@ #ifdef CONFIG_MMC static int initr_mmc(void) { -@@ -735,6 +750,9 @@ static void initcall_run_r(void) +@@ -730,6 +745,9 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(NMBM_MTD) INITCALL(initr_nmbm); #endif diff --git a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch index fa17ddb4ab0..fdf888faed4 100644 --- a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch +++ b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch @@ -64,10 +64,10 @@ +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_ISO_PARTITION is not set +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="nor0" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/zbtlink_zbt-wg3526-16m_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/zbtlink_zbt-wg3526-16m_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y diff --git a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch index 22691a0a2af..84b80449ac1 100644 --- a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch +++ b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_netcore_n60_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -69,13 +70,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/netcore_n60_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netcore_n60_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch index 96ec7da4754..279175e6e54 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-emmc_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -30,6 +30,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -75,10 +76,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -140,7 +141,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-nor_defconfig -@@ -0,0 +1,136 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -169,6 +170,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -212,11 +214,11 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="u-boot-env" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_nor_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3_nor_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -279,7 +281,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-sd_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -309,6 +311,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -354,10 +357,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_sdmmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -419,7 +422,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-snand_defconfig -@@ -0,0 +1,132 @@ +@@ -0,0 +1,133 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -446,6 +449,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -490,13 +494,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_snand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch index 1a3d1781051..6f86e649f1c 100644 --- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch +++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig -@@ -0,0 +1,104 @@ +@@ -0,0 +1,105 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -57,13 +58,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_redmi-ax6000_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/xiaomi_redmi-ax6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch index a72e42bace8..55e813fc507 100644 --- a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch +++ b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr4288_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -69,13 +70,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr4288_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/tplink_tl-xdr4288_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -131,7 +132,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6086_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -157,6 +158,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -200,13 +202,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr6086_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/tplink_tl-xdr6086_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -262,7 +264,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6088_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -288,6 +290,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -331,13 +334,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr6088_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/tplink_tl-xdr6088_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch index d5babe0848f..5e6724fd472 100644 --- a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch +++ b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_qihoo-360t7_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -68,13 +69,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/qihoo-360t7_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/qihoo-360t7_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch index 0a35cf9da73..324752b8a9b 100644 --- a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch +++ b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-wr30u_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -68,13 +69,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_mi-router-wr30u_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/xiaomi_mi-router-wr30u_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch index aed988955a1..ed4360bcb08 100644 --- a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch +++ b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_h3c_magic-nx30-pro_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -68,13 +69,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/h3c_magic-nx30-pro_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/h3c_magic-nx30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch index b44a601e9a3..1fe87736a01 100644 --- a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch +++ b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch @@ -134,7 +134,7 @@ +}; --- /dev/null +++ b/configs/mt7986a_glinet_gl-mt6000_defconfig -@@ -0,0 +1,104 @@ +@@ -0,0 +1,105 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -160,6 +160,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -195,9 +196,9 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/glinet_gl-mt6000_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/glinet_gl-mt6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch index fc29b8b08a8..ba94bb173d4 100644 --- a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch +++ b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-emmc_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -29,6 +29,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -70,10 +71,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000m-emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/cmcc_rax3000m-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -126,7 +127,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-nand_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -152,6 +153,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -194,13 +196,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000m-nand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/cmcc_rax3000m-nand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch index 6d6fe48db6f..ba9b176a655 100644 --- a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch +++ b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_jcg_q30-pro_defconfig -@@ -0,0 +1,123 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -68,13 +69,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/jcg_q30-pro_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/jcg_q30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch index b7315638154..05c1bc361b1 100644 --- a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch +++ b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_zyxel_ex5601-t0_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="EX5601> " @@ -69,13 +70,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/zyxel_ex5601-t0_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/zyxel_ex5601-t0_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch index ac4ed42d923..0894f54d759 100644 --- a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch +++ b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-ax3000t_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,108 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_mi-router-ax3000t_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/xiaomi_mi-router-ax3000t_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch index 2be2792a1ce..fd5644f8e98 100644 --- a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch +++ b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_jdcloud_re-cp-03_defconfig -@@ -0,0 +1,110 @@ +@@ -0,0 +1,111 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -27,6 +27,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -66,10 +67,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/jdcloud_re-cp-03_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/jdcloud_re-cp-03_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch index 8bf9eb0a0d5..61c07cdca3d 100644 --- a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch +++ b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-emmc_defconfig -@@ -0,0 +1,144 @@ +@@ -0,0 +1,145 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -30,6 +30,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -76,10 +77,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3-mini_emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3-mini_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -147,7 +148,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-snand_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,138 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -174,6 +175,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -219,13 +221,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3-mini_snand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r3-mini_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch index bff81c3021a..979faf425c6 100644 --- a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch +++ b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_nokia_ea0326gmp_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,108 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/nokia_ea0326gmp_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/nokia_ea0326gmp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch index 7c37e0a215d..ec7d8e04af2 100644 --- a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch +++ b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_abt_asr3000_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,108 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/abt_asr3000_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/abt_asr3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch b/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch index e7e09261483..a8b66b13a92 100644 --- a/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch +++ b/package/boot/uboot-mediatek/patches/445-add-cudy_tr3000-v1.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cudy_tr3000-v1_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,108 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cudy_tr3000-v1_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/cudy_tr3000-v1_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/445-add-netis-nx31.patch b/package/boot/uboot-mediatek/patches/445-add-netis-nx31.patch index 682e211eca0..70daee740eb 100644 --- a/package/boot/uboot-mediatek/patches/445-add-netis-nx31.patch +++ b/package/boot/uboot-mediatek/patches/445-add-netis-nx31.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_netis_nx31_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/netis_nx31_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netis_nx31_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/446-add-cmcc_a10.patch b/package/boot/uboot-mediatek/patches/446-add-cmcc_a10.patch index 9f4a6c29b13..f3c9c8d8c82 100644 --- a/package/boot/uboot-mediatek/patches/446-add-cmcc_a10.patch +++ b/package/boot/uboot-mediatek/patches/446-add-cmcc_a10.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cmcc_a10_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_a10_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/cmcc_a10_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch index afaadd6d50c..95085339f66 100644 --- a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch +++ b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-emmc_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -32,6 +32,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -77,10 +78,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -141,7 +142,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-sdmmc_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -173,6 +174,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -218,10 +220,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_sdmmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -282,7 +284,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-snand_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -311,6 +313,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -356,13 +359,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_snand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -870,7 +873,7 @@ +}; --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-emmc_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -902,6 +905,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -947,10 +951,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_emmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4-poe_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -1011,7 +1015,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-sdmmc_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1043,6 +1047,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -1088,10 +1093,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_sdmmc_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4-poe_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -1152,7 +1157,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-snand_defconfig -@@ -0,0 +1,138 @@ +@@ -0,0 +1,139 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1181,6 +1186,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -1226,13 +1232,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_snand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bananapi_bpi-r4-poe_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch index 8354e65ee0a..fbabefbd616 100644 --- a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch +++ b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xtr8488_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -26,6 +26,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -69,13 +70,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xtr8488_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/tplink_tl-xtr8488_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch index cae928e0682..089de4e8d28 100644 --- a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch +++ b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch @@ -15,7 +15,7 @@ Subject: [PATCH] add xiaomi redmi ax6s --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1120,6 +1120,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1122,6 +1122,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7622-linksys-e8450-ubi.dtb \ mt7622-ubnt-unifi-6-lr.dtb \ mt7622-ubnt-unifi-6-lr-v3.dtb \ @@ -194,7 +194,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +}; --- /dev/null +++ b/configs/mt7622_xiaomi_redmi-router-ax6s-ubi-loader_defconfig -@@ -0,0 +1,98 @@ +@@ -0,0 +1,99 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -216,6 +216,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +# CONFIG_AUTO_COMPLETE is not set @@ -241,10 +242,10 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_CMD_UBI_RENAME=y +CONFIG_DOS_PARTITION=y +CONFIG_EFI_PARTITION=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi-redmi-router-ax6s-ubi-loader_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/xiaomi-redmi-router-ax6s-ubi-loader_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_PROT_UDP=y diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch index 722f1eecc63..a3602289cd5 100644 --- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch +++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch @@ -206,7 +206,7 @@ +}; --- /dev/null +++ b/configs/mt7981_openwrt-one-nor_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,126 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -232,6 +232,7 @@ +CONFIG_SYS_PBSIZE=1049 +CONFIG_LOGLEVEL=7 +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="OpenWrt One> " @@ -278,10 +279,10 @@ +CONFIG_CMD_UBI=y +CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_OVERWRITE=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/openwrt-one-nor_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/openwrt-one-nor_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y @@ -334,7 +335,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7981_openwrt-one-spi-nand_defconfig -@@ -0,0 +1,126 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -359,6 +360,7 @@ +CONFIG_SYS_PBSIZE=1049 +CONFIG_LOGLEVEL=7 +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="OpenWrt One> " @@ -406,13 +408,13 @@ +CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/openwrt-one-spi-nand_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/openwrt-one-spi-nand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y diff --git a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch index 253939a2be1..1ab71ffbae6 100644 --- a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch +++ b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch @@ -147,7 +147,7 @@ +}; --- /dev/null +++ b/configs/mt7981_glinet_gl-x3000_defconfig -@@ -0,0 +1,99 @@ +@@ -0,0 +1,100 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -176,6 +176,7 @@ +CONFIG_SYS_CBSIZE=512 +CONFIG_SYS_PBSIZE=1049 +CONFIG_LOGLEVEL=7 ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -219,8 +220,8 @@ +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/glinet_gl-x3000_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/glinet_gl-x3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y diff --git a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch index d4f15abc3f2..afadb455ecf 100644 --- a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch +++ b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_arcadyan_mozart_defconfig -@@ -0,0 +1,114 @@ +@@ -0,0 +1,115 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -32,6 +32,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -72,10 +73,10 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/arcadyan_mozart_env" ++CONFIG_ENV_REDUNDANT=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/arcadyan_mozart_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch b/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch index bd2573b584e..25ad6510d3b 100644 --- a/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch +++ b/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch @@ -13,7 +13,7 @@ Signed-off-by: Enrico Mioso --- a/common/board_r.c +++ b/common/board_r.c -@@ -706,19 +706,13 @@ static void initcall_run_r(void) +@@ -701,19 +701,13 @@ static void initcall_run_r(void) INITCALL(serial_initialize); INITCALL(initr_announce); INITCALL(dm_announce); @@ -33,7 +33,7 @@ Signed-off-by: Enrico Mioso #if CONFIG_IS_ENABLED(PCI_INIT_R) && CONFIG_IS_ENABLED(SYS_EARLY_PCI_INIT) /* * Do early PCI configuration _before_ the flash gets initialised, -@@ -733,7 +727,6 @@ static void initcall_run_r(void) +@@ -728,7 +722,6 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(MTD_NOR_FLASH) INITCALL(initr_flash); #endif @@ -41,7 +41,7 @@ Signed-off-by: Enrico Mioso #if CONFIG_IS_ENABLED(PPC) || CONFIG_IS_ENABLED(M68K) || CONFIG_IS_ENABLED(X86) /* initialize higher level parts of CPU like time base and timers */ INITCALL(cpu_init_r); -@@ -762,6 +755,10 @@ static void initcall_run_r(void) +@@ -757,6 +750,10 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(PVBLOCK) INITCALL(initr_pvblock); #endif diff --git a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch index 243099d2f5b..f2171b472f5 100644 --- a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch +++ b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch @@ -253,7 +253,7 @@ Signed-off-by: Enrico Mioso +}; --- /dev/null +++ b/configs/mt7981_gatonetworks_gdsp_defconfig -@@ -0,0 +1,145 @@ +@@ -0,0 +1,146 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -281,6 +281,7 @@ Signed-off-by: Enrico Mioso +CONFIG_LOGLEVEL=7 +CONFIG_CONSOLE_MUX=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="GDSP> " @@ -341,10 +342,10 @@ Signed-off-by: Enrico Mioso +CONFIG_EFI_PARTITION=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_MTD_DEV="u-boot-env" -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/gatonetworks_gdsp_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/gatonetworks_gdsp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch index 92408c3ff42..58dc786c4eb 100644 --- a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch +++ b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_mercusys_mr90x-v1_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,108 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -57,13 +58,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/mercusys_mr90x-v1_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/mercusys_mr90x-v1_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch index 02f613cbe2b..91d7b6fa23d 100644 --- a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch +++ b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_routerich_ax3000_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/routerich_ax3000_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/routerich_ax3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/461-add-asus-zenwifi-bt8.patch b/package/boot/uboot-mediatek/patches/461-add-asus-zenwifi-bt8.patch index 8327b6ea6ed..e7ef0566722 100644 --- a/package/boot/uboot-mediatek/patches/461-add-asus-zenwifi-bt8.patch +++ b/package/boot/uboot-mediatek/patches/461-add-asus-zenwifi-bt8.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_asus_zenwifi-bt8_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,131 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -29,6 +29,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7988> " @@ -74,13 +75,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/asus_zenwifi-bt8_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/asus_zenwifi-bt8_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/462-add-netcore-n60-pro.patch b/package/boot/uboot-mediatek/patches/462-add-netcore-n60-pro.patch index 69af3418a69..c4a9ca1c1e3 100644 --- a/package/boot/uboot-mediatek/patches/462-add-netcore-n60-pro.patch +++ b/package/boot/uboot-mediatek/patches/462-add-netcore-n60-pro.patch @@ -1,7 +1,6 @@ -Add test header. --- /dev/null +++ b/configs/mt7986_netcore_n60-pro_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -27,6 +26,7 @@ Add test header. +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7986> " @@ -70,13 +70,13 @@ Add test header. +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/netcore_n60-pro_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netcore_n60-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch b/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch index a5f8873775a..6eca20317fa 100644 --- a/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch +++ b/package/boot/uboot-mediatek/patches/463-add-snr-snr-cpe-ax2.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_snr_snr-cpe-ax2_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,107 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -24,6 +24,7 @@ +CONFIG_LOGLEVEL=7 +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " @@ -59,13 +60,13 @@ +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_REDUNDANT=y +CONFIG_ENV_UBI_PART="ubi" +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/snr_snr-cpe-ax2_env" ++CONFIG_ENV_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/snr_snr-cpe-ax2_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y diff --git a/package/boot/uboot-mediatek/patches/464-add-GL.iNet-GL-MT2500-Brume2.patch b/package/boot/uboot-mediatek/patches/464-add-GL.iNet-GL-MT2500-Brume2.patch index 4cc4648a9a8..58905d42ad8 100644 --- a/package/boot/uboot-mediatek/patches/464-add-GL.iNet-GL-MT2500-Brume2.patch +++ b/package/boot/uboot-mediatek/patches/464-add-GL.iNet-GL-MT2500-Brume2.patch @@ -138,7 +138,7 @@ Signed-off-by: Enrico Mioso +}; --- /dev/null +++ b/configs/mt7981_glinet_gl-mt2500_defconfig -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -169,6 +169,7 @@ Signed-off-by: Enrico Mioso +CONFIG_LOGLEVEL=7 +CONFIG_CONSOLE_MUX=y +CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y ++# CONFIG_BOARD_INIT is not set +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="GL-MT2500> " @@ -218,8 +219,8 @@ Signed-off-by: Enrico Mioso +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y -+CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/glinet_gl-mt2500_env" ++CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y ++CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/glinet_gl-mt2500_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y