From 3da8e385e0fde0b70d67964ef321482ab27bf95f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Oct 2024 12:41:45 -0700 Subject: [PATCH] mediatek: fix wrong compatible string The u-boot,env driver does not have layout in compatible. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16616 Signed-off-by: Robert Marko --- target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts | 4 ++-- .../arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 4 ++-- .../arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso | 4 ++-- .../patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts index 88538c8b0a..5ee8ba5cd9 100644 --- a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts +++ b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts @@ -38,14 +38,14 @@ ubi-volume-ubootenv { volname = "ubootenv"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; ubi-volume-ubootenv2 { volname = "ubootenv2"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi index 14c615b67c..fae5d0ebfa 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi @@ -349,14 +349,14 @@ ubi-volume-ubootenv { volname = "ubootenv"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; ubi-volume-ubootenv2 { volname = "ubootenv2"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso index b5a67c725b..02ecedda72 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso @@ -44,14 +44,14 @@ ubi-volume-ubootenv { volname = "ubootenv"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; ubi-volume-ubootenv2 { volname = "ubootenv2"; nvmem-layout { - compatible = "u-boot,env-redundant-bool-layout"; + compatible = "u-boot,env-redundant-bool"; }; }; 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 a28d274493..c378a302d4 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 @@ -85,14 +85,14 @@ + ubi-volume-ubootenv { + volname = "ubootenv"; + nvmem-layout { -+ compatible = "u-boot,env-redundant-bool-layout"; ++ compatible = "u-boot,env-redundant-bool"; + }; + }; + + ubi-volume-ubootenv2 { + volname = "ubootenv2"; + nvmem-layout { -+ compatible = "u-boot,env-redundant-bool-layout"; ++ compatible = "u-boot,env-redundant-bool"; + }; + }; + -- 2.30.2