From 6f13425f3f8de1cfcac5719faa1ba4da8b0a7259 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sun, 20 Jul 2025 22:56:26 +0800 Subject: [PATCH] uboot-mediatek: convert env in mtd to upstream implementation In the upstream implementation of env in mtd, ENV_MTD_NAME symbol was renamed to ENV_MTD_DEV. Therefore, we have to adjust the symbol to make it work properly. ENV_SIZE_REDUND symbol will be removed in this patch because the upstream env in mtd implementation no longer requires it. Fixes: 41a9c9de66a7 ("uboot-mediatek: update to v2025.07") Signed-off-by: Shiji Yang --- ...configs-add-useful-options-to-mt7981-rfb.patch | 7 +++---- .../patches/412-add-ubnt-unifi-6-lr.patch | 15 ++++++--------- .../patches/421-zbtlink_zbt-wg3526-16m.patch | 5 ++--- .../uboot-mediatek/patches/430-add-bpi-r3.patch | 5 ++--- .../patches/458-add-GatoNetworks-GDSP.patch | 5 ++--- 5 files changed, 15 insertions(+), 22 deletions(-) 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 5979abbf392..145e8c37ea0 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 @@ -356,7 +356,7 @@ -CONFIG_LMB_MAX_REGIONS=64 --- a/configs/mt7981_nor_rfb_defconfig +++ b/configs/mt7981_nor_rfb_defconfig -@@ -5,37 +5,74 @@ CONFIG_ARCH_MEDIATEK=y +@@ -5,37 +5,73 @@ CONFIG_ARCH_MEDIATEK=y CONFIG_TEXT_BASE=0x41e00000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 @@ -421,9 +421,8 @@ CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_ENV_MTD_NAME="u-boot-env" -+CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ENV_MTD_DEV="u-boot-env" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y @@ -438,7 +437,7 @@ # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y -@@ -60,9 +97,9 @@ CONFIG_PINCTRL_MT7981=y +@@ -60,9 +96,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/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch index 7d58df2e482..42654b7a0f2 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 @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v1_defconfig -@@ -0,0 +1,114 @@ +@@ -0,0 +1,113 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -56,9 +56,8 @@ +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_ENV_MTD_NAME="nor0" -+CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=y @@ -117,7 +116,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v2_defconfig -@@ -0,0 +1,114 @@ +@@ -0,0 +1,113 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -173,9 +172,8 @@ +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_ENV_MTD_NAME="nor0" -+CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=y @@ -234,7 +232,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7622_ubnt_unifi-6-lr-v3_defconfig -@@ -0,0 +1,113 @@ +@@ -0,0 +1,112 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -290,9 +288,8 @@ +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_ENV_MTD_NAME="nor0" -+CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=y 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 754335de1ba..fa17ddb4ab0 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 @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7621_zbtlink_zbt-wg3526-16m_defconfig -@@ -0,0 +1,98 @@ +@@ -0,0 +1,97 @@ +CONFIG_MIPS=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_SYS_MALLOC_LEN=0x100000 @@ -64,9 +64,8 @@ +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_ISO_PARTITION is not set +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_ENV_MTD_NAME="nor0" -+CONFIG_ENV_SIZE_REDUND=0x10000 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=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 1a7bf700204..96ec7da4754 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -140,7 +140,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/configs/mt7986a_bpi-r3-nor_defconfig -@@ -0,0 +1,137 @@ +@@ -0,0 +1,136 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -213,9 +213,8 @@ +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_ENV_MTD_NAME="u-boot-env" -+CONFIG_ENV_SIZE_REDUND=0x20000 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=y 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 23c3c9c5538..243099d2f5b 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,146 @@ +@@ -0,0 +1,145 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -341,9 +341,8 @@ Signed-off-by: Enrico Mioso +CONFIG_EFI_PARTITION=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y -+CONFIG_ENV_MTD_NAME="u-boot-env" -+CONFIG_ENV_SIZE_REDUND=0x0 +CONFIG_SYS_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_VARS_UBOOT_RUNTIME_CONFIG=y -- 2.47.2