mediatek: fix u-boot env layout NVMEM definitions

s/u-boot,env-layout/u-boot,env/g

Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com>

diff --git a/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi b/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
index e9050e02e5ec5ec5fe0b3386dde997e6f5ea967d..919fb23c53a4c7654fe3c1c2a2eeea21ad78b9ad 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
@@ -148,7 +148,7 @@
                                        partname = "u-boot-env";
 
                                        nvmem-layout {
-                                               compatible = "u-boot,env-layout";
+                                               compatible = "u-boot,env";
                                        };
                                };
 

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts
index 15818a90fca02955879d1bcca55ba2153e390621..0bd3ac0a2954990b7edb8eada54d4dae6c018953 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts
@@ -164,7 +164,7 @@
                                block-partition-u-boot-env {
                                        partname = "u-boot-env";
                                        nvmem-layout {
-                                               compatible = "u-boot,env-layout";
+                                               compatible = "u-boot,env";
                                        };
                                };
                        };

diff --git a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-emmc.dts b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-emmc.dts
index abd4d4e59d74cc0d24e8c9e10e16c0859844e003..264c9856127b77eee3447f8923c09b960dac0a21 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-emmc.dts
+++ b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-emmc.dts
@@ -32,7 +32,7 @@
                                        partname = "u-boot-env";
 
                                        nvmem-layout {
-                                               compatible = "u-boot,env-layout";
+                                               compatible = "u-boot,env";
                                        };
                                };
 

diff --git a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
index fd0e1a69157ed0f27c32376aabab0fcc85ce23b9..fe55f2ea3a34a79e5f0c8bd03b86ccc973f89e55 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
@@ -325,7 +325,7 @@
                                        partname = "u-boot-env";
 
                                        nvmem-layout {
-                                               compatible = "u-boot,env-layout";
+                                               compatible = "u-boot,env";
                                        };
                                };
 

diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
index 4945185d699e854da46cd713314a92ac8d9015ae..cd266d6b0f581ce00ccaa0579eeb1ad1de4a92dd 100644 (file)
--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
+++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
@@ -41,7 +41,7 @@
                                                block-partition-env {
                                                        partname = "ubootenv";
                                                        nvmem-layout {
-                                                               compatible = "u-boot,env-layout";
+                                                               compatible = "u-boot,env";
                                                        };
                                                };
                                                emmc_rootfs: block-partition-production {

diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
index 1f5e1491a471e9f95373bfeb1d38ca58738acbaa..c2ab424e3e6ef242db387a72bb7c5d2cb6206fd5 100644 (file)
--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
+++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
@@ -39,7 +39,7 @@
                                                block-partition-env {
                                                        partname = "ubootenv";
                                                        nvmem-layout {
-                                                               compatible = "u-boot,env-layout";
+                                                               compatible = "u-boot,env";
                                                        };
                                                };
                                                sd_rootfs: block-partition-production {

diff --git a/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch b/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
index 4feb0e5d1a7e96a29a7a976d1d5fad6b9949eefb..a28d274493d8ccf67e0f4a3a71eb3c4225ae47e3 100644 (file)
--- a/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
+++ b/target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch
@@ -25,7 +25,7 @@
 +                              block-partition-env {
 +                                      partname = "ubootenv";
 +                                      nvmem-layout {
-+                                              compatible = "u-boot,env-layout";
++                                              compatible = "u-boot,env";
 +                                      };
 +                              };
 +                              emmc_rootfs: block-partition-production {
@@ -52,7 +52,7 @@
 +                              block-partition-env {
 +                                      partname = "ubootenv";
 +                                      nvmem-layout {
-+                                              compatible = "u-boot,env-layout";
++                                              compatible = "u-boot,env";
 +                                      };
 +                              };
 +                              sd_rootfs: block-partition-production {