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 029e1aa17d71980023ff57073d691efee5caf5f3..999276e5adda3a8a759b0058aeb0c5f7e3c22351 100644 (file)
--- 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 a2657428968d9f25cb9946777d308042a69bf414..feb95ebb9fe25870bb09b6d7fe3974a927bc0ca9 100644 (file)
--- 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 516774531f74a9df5f63b1c5eaf46444928eb959..1f88e76e50e3aa0a52c4f44c83aa29e7de544349 100644 (file)
--- 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 a809845bced59dc9d611f28d0fc3cd1742ee578d..1136240882e3bc13cc4a734c6afc55c1e8c36333 100644 (file)
--- 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>;
 +              };
 +