From 0ed59099ee105925926df4d811b131b97706d530 Mon Sep 17 00:00:00 2001 From: Shine <4c.fce2@proton.me> Date: Tue, 11 Nov 2025 19:49:16 +0100 Subject: [PATCH] mpc85xx: p1010: Fix Sophos RED 15w NAND partitions This partially reverts 78d259e7d28d212425164fc64bf0b9d8669d6020. That commit broke mounting the root fs on Sophos RED 15w due to partition size mismatch, and changed the partition sequence, causing the OpenWrt partition numbers to change from mtd3:kernel/mtd4:ubi to mtd4:kernel/mtd5:ubi. Fixes: 78d259e7d28d ("mpc85xx: fix some dtc warnings") (cherry-picked from commit 09e7b24ceb5d9310334c4f88327dc6d58052e7fd) Signed-off-by: Shine <4c.fce2@proton.me> Link: https://github.com/openwrt/openwrt/pull/21062 Signed-off-by: Hauke Mehrtens --- .../arch/powerpc/boot/dts/red-15w-rev1.dts | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts index 19bb8023ed5..ac7209bd517 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts @@ -165,23 +165,19 @@ read-only; }; + partition@300000 { + reg = <0x300000 0x800000>; + label = "kernel"; + }; + + partition@b00000 { + reg = <0xb00000 0x7500000>; + label = "ubi"; + }; + oem-partition@300000 { reg = <0x300000 0x1900000>; label = "sophos-os1"; - - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - reg = <0x0 0x800000>; - label = "kernel"; - }; - - partition@800000 { - reg = <0x800000 0x7500000>; - label = "ubi"; - }; }; oem-partition@1c00000 { -- 2.47.3