On Tue, 30 Jul 2024 at 10:46, Enrico Mioso <mrkiko...@gmail.com> wrote: > > s/u-boot,env-layout/u-boot,env/g > > Signed-off-by: Enrico Mioso <mrkiko...@gmail.com>
Thanks, Merged via: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=6bb334c5cf1c96a208c8dab93123476248b78254 Regards, Robert > --- > .../mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi | 2 +- > target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts | 2 +- > target/linux/mediatek/dts/mt7981b-unielec-u7981-01-emmc.dts | 2 +- > target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts | 2 +- > .../arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso | 2 +- > .../arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso | 2 +- > .../patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch | 4 ++-- > 7 files changed, 8 insertions(+), 8 deletions(-) > > 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 e9050e02e5..919fb23c53 100644 > --- 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 15818a90fc..0bd3ac0a29 100644 > --- 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 abd4d4e59d..264c985612 100644 > --- 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 fd0e1a6915..fe55f2ea3a 100644 > --- 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 4945185d69..cd266d6b0f 100644 > --- > 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 1f5e1491a4..c2ab424e3e 100644 > --- > 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 4feb0e5d1a..a28d274493 100644 > --- > 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 { > -- > 2.45.2 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel