From 4e6ebdd7ce691512316978cbf329a82fbfc46a2a Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@gmail.com>
Date: Thu, 23 Dec 2021 21:45:19 +0100
Subject: [PATCH] apm821xx: remove overlapping partitions

Apart from the dtb partition, these were all "read-only;"
they serve no purpose other than being a copy of what
netgear had defined in their original firmware.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
 .../linux/apm821xx/dts/netgear-wndr4700.dts   | 43 ++++++++-----------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 286eba203b..6ec3d3ee63 100644
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -177,24 +177,13 @@
 		nand {
 			nand-is-boot-medium;
 
-			partition0,0@0 {
-				label = "NAND 128MiB 3,3V 8-bit";
-				reg = <0x00000000 0x08000000>;
-				read-only;
-			};
-
-			partition0,1@0 {
+			partition@0 {
 				label = "uboot";
 				reg = <0x00000000 0x00180000>;
 				read-only;
 			};
 
-			partition0,2@180000 {
-				label = "device-tree";
-				reg = <0x00180000 0x00020000>;
-			};
-
-			partition0,3@180000 {
+			partition@180000 {
 				label = "kernel";
 				reg = <0x00180000 0x00380000>;
 				/*
@@ -208,52 +197,54 @@
 				 */
 			};
 
-			partition0,4@500000 {
+			partition@500000 {
 				label = "ubi";
 				reg = <0x00500000 0x014e0000>;
 			};
 
-			partition0,5@19e0000 {
+
+			/*
+			 * Netgear's u-boot in the fw_recovery mode (can be
+			 * triggered by holding the reset button, or if
+			 * "bootm" fails) will not flash past this point
+			 * (= 0x19E0000).
+			 */
+
+			partition@19e0000 {
 				label = "config";
 				reg = <0x019e0000 0x00080000>;
 				read-only;
 			};
 
-			partition0,6@1a60000 {
+			partition@1a60000 {
 				label = "pot";
 				reg = <0x01a60000 0x00080000>;
 				read-only;
 			};
 
-			partition0,7@1ae0000 {
+			partition@1ae0000 {
 				label = "traffic_meter";
 				reg = <0x01ae0000 0x00300000>;
 				read-only;
 			};
 
-			partition0,8@1de0000 {
+			partition@1de0000 {
 				label = "language";
 				reg = <0x01de0000 0x001c0000>;
 				read-only;
 			};
 
-			partition0,9@1fa0000 {
+			partition@1fa0000 {
 				label = "ecos";
 				reg = <0x01fa0000 0x06020000>;
 				read-only;
 			};
 
-			partition0,10@7fc0000 {
+			partition@7fc0000 {
 				label = "wifi_data";
 				reg = <0x07fc0000 0x00040000>;
 				read-only;
 			};
-
-			partition0,11@180000 {
-				label = "firmware";
-				reg = <0x00180000 0x01860000>;
-				read-only;
-			};
 		};
 	};
 };
-- 
2.30.2