From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 1 Mar 2019 00:55:16 +0000 (+0100)
Subject: oxnas: unify MTD partition names
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=858aebc0ef;p=openwrt%2Fstaging%2F981213.git

oxnas: unify MTD partition names

Use 'u-boot' and 'u-boot-env' like the majority of OpenWrt targets
does...

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 029e1aa17d..999276e5ad 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
@@ -80,13 +80,13 @@
 		};
 
 		partition@40000 {
-			label = "uboot";
+			label = "u-boot";
 			reg = <0x00040000 0x00380000>;
 			read-only;
 		};
 
 		partition@3c0000 {
-			label = "uboot_env";
+			label = "u-boot-env";
 			reg = <0x003c0000 0x00080000>;
 		};
 
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 a265742896..feb95ebb9f 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
@@ -93,13 +93,13 @@
 		};
 
 		partition@40000 {
-			label = "uboot";
+			label = "u-boot";
 			reg = <0x00040000 0x00380000>;
 			read-only;
 		};
 
 		partition@3c0000 {
-			label = "uboot_env";
+			label = "u-boot-env";
 			reg = <0x003c0000 0x00080000>;
 		};
 
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
index 516774531f..1f88e76e50 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
@@ -144,11 +144,16 @@
 		};
 
 		partition@40000 {
-			label = "u-boot";
-			reg = <0x00040000 0x00200000>;
+			label = "uboot";
+			reg = <0x00040000 0x001e0000>;
 			read-only;
 		};
 
+		partition@220000 {
+			label = "uboot_env";
+			reg = <0x00220000 0x00020000>;
+		};
+
 		partition@240000 {
 			label = "initrd";
 			reg = <0x00240000 0x00600000>;
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
index a809845bce..1136240882 100644
--- 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
@@ -12,13 +12,13 @@
  		};
  
 +		partition@40000 {
-+			label = "uboot";
++			label = "u-boot";
 +			reg = <0x00040000 0x00380000>;
 +			read-only;
 +		};
 +
 +		partition@3c0000 {
-+			label = "uboot_env";
++			label = "u-boot-env";
 +			reg = <0x003c0000 0x00080000>;
 +		};
 +