From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 25 Feb 2019 11:02:15 +0000 (+0100)
Subject: oxnas: add missing NAND partitions
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=994428f3950c70bc92e5e6b68e784d8d660ca4ea;p=openwrt%2Fstaging%2Faparcar.git

oxnas: add missing NAND partitions

add kernel and other missing NAND flash partitions to allow booting
using stock loader instead of the 2nd-stage bootloader.
This will ease installation from stock firmware on pogoplugs as well
as stg212 aka. medion nas.

Existing users of OpenWrt on those boards will have to boot initramfs
generated after this commit and subsequently flash first the ubinized
image, then again run initramfs to flash sysupgrade.tar image, and
then restore bootcmd in U-Boot environment back to the original setting
('nboot 60500000 0 440000' or something like that) instead of jumping
into the now no longer used 2nd-stage loader.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
index 2872d40e3d..029e1aa17d 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
@@ -74,11 +74,27 @@
 		nand-ecc-algo = "hamming";
 
 		partition@0 {
-			label = "boot";
-			reg = <0x00000000 0x00e00000>;
+			label = "stage1";
+			reg = <0x00000000 0x00040000>;
 			read-only;
 		};
 
+		partition@40000 {
+			label = "uboot";
+			reg = <0x00040000 0x00380000>;
+			read-only;
+		};
+
+		partition@3c0000 {
+			label = "uboot_env";
+			reg = <0x003c0000 0x00080000>;
+		};
+
+		partition@440000 {
+			label = "kernel";
+			reg = <0x00440000 0x009c0000>;
+		};
+
 		partition@e00000 {
 			label = "ubi";
 			reg = <0x00e00000 0x07200000>;
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
index 5fd2617f2f..a265742896 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
@@ -87,11 +87,27 @@
 		nand-ecc-algo = "hamming";
 
 		partition@0 {
-			label = "boot";
-			reg = <0x00000000 0x00e00000>;
+			label = "stage1";
+			reg = <0x00000000 0x00040000>;
 			read-only;
 		};
 
+		partition@40000 {
+			label = "uboot";
+			reg = <0x00040000 0x00380000>;
+			read-only;
+		};
+
+		partition@3c0000 {
+			label = "uboot_env";
+			reg = <0x003c0000 0x00080000>;
+		};
+
+		partition@440000 {
+			label = "kernel";
+			reg = <0x00440000 0x009c0000>;
+		};
+
 		partition@e00000 {
 			label = "ubi";
 			reg = <0x00e00000 0x07200000>;
diff --git a/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch b/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch
new file mode 100644
index 0000000000..a809845bce
--- /dev/null
+++ b/target/linux/oxnas/patches-4.14/020-nand-partitions-on-pogoplug-v3.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
+@@ -74,11 +74,27 @@
+ 		nand-ecc-algo = "hamming";
+ 
+ 		partition@0 {
+-			label = "boot";
+-			reg = <0x00000000 0x00e00000>;
++			label = "stage1";
++			reg = <0x00000000 0x00040000>;
+ 			read-only;
+ 		};
+ 
++		partition@40000 {
++			label = "uboot";
++			reg = <0x00040000 0x00380000>;
++			read-only;
++		};
++
++		partition@3c0000 {
++			label = "uboot_env";
++			reg = <0x003c0000 0x00080000>;
++		};
++
++		partition@440000 {
++			label = "kernel";
++			reg = <0x00440000 0x009c0000>;
++		};
++
+ 		partition@e00000 {
+ 			label = "ubi";
+ 			reg = <0x00e00000 0x07200000>;