From: Alberto Bursi <bobafetthotmail@gmail.com>
Date: Fri, 27 Mar 2020 11:21:30 +0000 (+0100)
Subject: kirkwood: fix DTS partitions for Pogoplug E02
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43105f24eb50c2fa3bbadd3225beeb5f1981f6bb;p=openwrt%2Fstaging%2Fneocturne.git

kirkwood: fix DTS partitions for Pogoplug E02

The Pogoplug E02 was not using the correct partitions
in device tree, but used the ones from upstream and
thus could not boot OpenWrt images.

In contrast, uboot-kirkwood is using the correct
partitions since d3fc4fbd74dc ("uboot-kirkwood: re-add
Pogoplug E02 support").

This patch corrects the partitions in DTS for kernels
4.14, 4.19 and 5.4.

Fixes: 2b0fa00da8fc ("kirkwood: add Pogoplug E02 Kernel support")

Signed-off-by: Alberto Bursi <bobafetthotmail@gmail.com>
Reviewed-by: Pawel Dembicki <paweldembicki@gmail.com>
Reviewed-by: Sungbo Eo <mans0n@gorani.run>
[commit title/message facelift, refresh 4.14 patch]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch b/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
index b2a9c461d8..26dbf8a734 100644
--- a/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
+++ b/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
@@ -30,3 +30,39 @@
  			label = "pogo_e02:orange:fault";
  			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
  		};
+@@ -97,24 +104,24 @@
+ 	status = "okay";
+ 
+ 	partition@0 {
+-		label = "u-boot";
+-		reg = <0x0000000 0x100000>;
++		label = "uboot";
++		reg = <0x0 0xe0000>;
+ 		read-only;
+ 	};
+ 
+-	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x400000>;
++	partition@e0000 {
++		label = "uboot_env";
++		reg = <0xe0000 0x20000>;
+ 	};
+ 
+-	partition@500000 {
+-		label = "pogoplug";
+-		reg = <0x0500000 0x2000000>;
++	partition@100000 {
++		label = "second_stage_uboot";
++		reg = <0x100000 0x100000>;
+ 	};
+ 
+-	partition@2500000 {
+-		label = "root";
+-		reg = <0x02500000 0x5b00000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0x7e00000>;
+ 	};
+ };
+ 
diff --git a/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch b/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
index 59d2893466..4b64337c9c 100644
--- a/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
+++ b/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
@@ -30,3 +30,41 @@
  			label = "pogo_e02:orange:fault";
  			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
  		};
+@@ -95,25 +102,26 @@
+ 	status = "okay";
+ 
+ 	partition@0 {
+-		label = "u-boot";
+-		reg = <0x0000000 0x100000>;
++		label = "uboot";
++		reg = <0x0 0xe0000>;
+ 		read-only;
+ 	};
+ 
+-	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x400000>;
++	partition@e0000 {
++		label = "uboot_env";
++		reg = <0xe0000 0x20000>;
+ 	};
+ 
+-	partition@500000 {
+-		label = "pogoplug";
+-		reg = <0x0500000 0x2000000>;
++	partition@100000 {
++		label = "second_stage_uboot";
++		reg = <0x100000 0x100000>;
+ 	};
+ 
+-	partition@2500000 {
+-		label = "root";
+-		reg = <0x02500000 0x5b00000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0x7e00000>;
+ 	};
++
+ };
+ 
+ &mdio {
diff --git a/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch b/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
index 59d2893466..fc384d3521 100644
--- a/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
+++ b/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
@@ -30,3 +30,39 @@
  			label = "pogo_e02:orange:fault";
  			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
  		};
+@@ -95,24 +102,24 @@
+ 	status = "okay";
+ 
+ 	partition@0 {
+-		label = "u-boot";
+-		reg = <0x0000000 0x100000>;
++		label = "uboot";
++		reg = <0x0 0xe0000>;
+ 		read-only;
+ 	};
+ 
+-	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x400000>;
++	partition@e0000 {
++		label = "uboot_env";
++		reg = <0xe0000 0x20000>;
+ 	};
+ 
+-	partition@500000 {
+-		label = "pogoplug";
+-		reg = <0x0500000 0x2000000>;
++	partition@100000 {
++		label = "second_stage_uboot";
++		reg = <0x100000 0x100000>;
+ 	};
+ 
+-	partition@2500000 {
+-		label = "root";
+-		reg = <0x02500000 0x5b00000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0x7e00000>;
+ 	};
+ };
+