From b2ed4e31b4780fdf5a9fe5f11da1f74b058c8bb6 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 10 Nov 2021 11:26:59 -0600
Subject: Cannot use same stanza names at at91sam9x5cm.dtsi or partition order
 is incorrect

---
 recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts b/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
index 2ee2e86..f485baa 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
+++ b/recipes-kernel/linux/linux-at91-4.9.87/mtcdt/mtcdt.dts
@@ -220,19 +220,27 @@
 	    atmel,pmecc-cap = <4>;
 	    atmel,nand-has-dma;
 
+	    /* To ensure correct partition ordering, we must delete
+	     * at91sam9x5cm.dtsi partitions and not use the same names
+	     * for the stanzas. */
+	    /delete-node/ at91bootstrap@0;
+	    /delete-node/ uboot@40000;
+	    /delete-node/ ubootenv@c0000;
+	    /delete-node/ kernel@200000;
+	    /delete-node/ rootfs@800000;
+
 	    nand@0 {
 		label = "NANDFlash";
 		reg = <0x0 0x10000000>;
 	    };
-	    at91bootstrap@0 {
+	    at91bootstrapMT@0 {
 		label = "at91bootstrap";
 		reg = <0x0 0x40000>;
 	    };
-	    uboot@40000 {
+	    ubootMT@40000 {
 		label = "u-Boot";
 		reg = <0x40000 0x80000>;
 	    };
-	    /delete-node/ ubootenv@c0000;
 	    ubootconfig0@c0000 {
 		label = "u-Boot Config";
 		reg = <0xc0000 0xa0000>;
@@ -241,7 +249,6 @@
 		label = "u-Boot Redundant Config";
 		reg = <0x160000 0xa0000>;
 	    };
-	    /delete-node/ kernel@200000;
 	    uImage@200000 {
 		label = "uImage";
 		reg = <0x200000 0x600000>;
@@ -254,7 +261,6 @@
 		label = "OEM Config";
 		reg = <0x1000000 0x800000>;
 	    };
-	    /delete-node/ rootfs@800000;
 	    rootfs@1800000 {
 		label = "Rootfs";
 		reg = <0x1800000 0x8000000>;
-- 
cgit v1.2.3