[openwrt/openwrt] kernel: remove uboot,env hack

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f190a5e842d687cf53cce909ac22a77d9d94c683

commit f190a5e842d687cf53cce909ac22a77d9d94c683
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Wed Nov 26 23:24:16 2025 -0800

    kernel: remove uboot,env hack
    
    Since everything got migrated to the layouts driver, this is no longer
    needed.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/20948
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 ...mtd-nor-support-mtd-name-from-device-tree.patch |  2 +-
 ...-blktrans-call-add-disks-after-mtd-device.patch |  2 +-
 ...mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch |  2 +-
 ...egister-NVMEM-devices-for-partitions-with.patch | 48 ----------------------
 ...mtd-nor-support-mtd-name-from-device-tree.patch |  2 +-
 5 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/target/linux/ath79/patches-6.12/400-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-6.12/400-mtd-nor-support-mtd-name-from-device-tree.patch
index bbdc90c1cf..39f3fa76fc 100644
--- a/target/linux/ath79/patches-6.12/400-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/patches-6.12/400-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -33,7 +33,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
  	mtd->flags = MTD_CAP_NORFLASH;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -872,6 +872,17 @@ out_error:
+@@ -849,6 +849,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {
diff --git a/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index 5ccb6bc7d8..d5a68d681b 100644
--- a/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-6.12/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -1132,6 +1133,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1109,6 +1110,8 @@ int mtd_device_parse_register(struct mtd
  		register_reboot_notifier(&mtd->reboot_notifier);
  	}
  
diff --git a/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch b/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
index 5296541800..1b17c2fe88 100644
--- a/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
+++ b/target/linux/generic/hack-6.12/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -803,7 +803,8 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -780,7 +780,8 @@ int add_mtd_device(struct mtd_info *mtd)
  
  	mutex_unlock(&mtd_table_mutex);
  
diff --git a/target/linux/generic/pending-6.12/401-mtd-don-t-register-NVMEM-devices-for-partitions-with.patch b/target/linux/generic/pending-6.12/401-mtd-don-t-register-NVMEM-devices-for-partitions-with.patch
deleted file mode 100644
index 119f1da6dc..0000000000
--- a/target/linux/generic/pending-6.12/401-mtd-don-t-register-NVMEM-devices-for-partitions-with.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Tue, 31 Oct 2023 15:51:01 +0100
-Subject: [PATCH] mtd: don't register NVMEM devices for partitions with custom
- drivers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes issue exposed by upstream commit f4cf4e5db331 ("Revert
-"nvmem: add new config option"").
-
-Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
----
- drivers/mtd/mtdcore.c | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -549,6 +549,29 @@ static int mtd_nvmem_add(struct mtd_info
- 	struct device_node *node = mtd_get_of_node(mtd);
- 	struct nvmem_config config = {};
- 
-+	/*
-+	 * Do NOT register NVMEM device for any partition that is meant to be
-+	 * handled by a U-Boot env driver. That would result in associating two
-+	 * different NVMEM devices with the same OF node.
-+	 *
-+	 * An example of unwanted behaviour of above (forwardtrace):
-+	 * of_get_mac_addr_nvmem()
-+	 * of_nvmem_cell_get()
-+	 * __nvmem_device_get()
-+	 *
-+	 * We can't have __nvmem_device_get() return "mtdX" NVMEM device instead
-+	 * of U-Boot env NVMEM device. That would result in failing to find
-+	 * NVMEM cell.
-+	 *
-+	 * This issue seems to affect U-Boot env case only and will go away with
-+	 * switch to NVMEM layouts.
-+	 */
-+	if (of_device_is_compatible(node, "u-boot,env") ||
-+	    of_device_is_compatible(node, "u-boot,env-redundant-bool") ||
-+	    of_device_is_compatible(node, "u-boot,env-redundant-count") ||
-+	    of_device_is_compatible(node, "brcm,env"))
-+		return 0;
-+
- 	config.id = NVMEM_DEVID_NONE;
- 	config.dev = &mtd->dev;
- 	config.name = dev_name(&mtd->dev);
diff --git a/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
index ff686e03a7..af773a64eb 100644
--- a/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -41,7 +41,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
  		return PTR_ERR_OR_ZERO(mem->name);
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -872,6 +872,17 @@ out_error:
+@@ -849,6 +849,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {