From 4731f02fa2c24fad4179fb8f756ecc40f26b6916 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 30 Dec 2016 12:38:06 +0100
Subject: [PATCH] kirkwood: fix ubi partition name

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 target/linux/kirkwood/patches-4.4/110-ib62x0.patch   |  5 +++--
 target/linux/kirkwood/patches-4.4/130-iconnect.patch | 12 ++++++------
 target/linux/kirkwood/patches-4.4/190-nsa310s.patch  |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/target/linux/kirkwood/patches-4.4/110-ib62x0.patch b/target/linux/kirkwood/patches-4.4/110-ib62x0.patch
index 153c41b7828c..d6d10d8144e2 100644
--- a/target/linux/kirkwood/patches-4.4/110-ib62x0.patch
+++ b/target/linux/kirkwood/patches-4.4/110-ib62x0.patch
@@ -11,9 +11,10 @@
  	};
  
 -	partition@700000 {
-+	partition@200000 {
- 		label = "root";
+-		label = "root";
 -		reg = <0x0700000 0xf900000>;
++	partition@200000 {
++		label = "ubi";
 +		reg = <0x200000 0xfe00000>;
  	};
  
diff --git a/target/linux/kirkwood/patches-4.4/130-iconnect.patch b/target/linux/kirkwood/patches-4.4/130-iconnect.patch
index c95579d79300..3d464e79ea20 100644
--- a/target/linux/kirkwood/patches-4.4/130-iconnect.patch
+++ b/target/linux/kirkwood/patches-4.4/130-iconnect.patch
@@ -21,20 +21,20 @@
  	partition@100000 {
 -		label = "zImage";
 -		reg = <0x100000 0x300000>;
+-	};
+-
+-	partition@540000 {
+-		label = "initrd";
+-		reg = <0x540000 0x300000>;
 +		label = "second stage u-boot";
 +		reg = <0x100000 0x200000>;
  	};
  
--	partition@540000 {
--		label = "initrd";
--		reg = <0x540000 0x300000>;
--	};
--
 -	partition@980000 {
 -		label = "boot";
 -		reg = <0x980000 0x1f400000>;
 +	partition@200000 {
-+		label = "root";
++		label = "ubi";
 +		reg = <0x200000 0x1fe00000>;
  	};
  };
diff --git a/target/linux/kirkwood/patches-4.4/190-nsa310s.patch b/target/linux/kirkwood/patches-4.4/190-nsa310s.patch
index 54c0e81510e2..d88cd74e99e6 100644
--- a/target/linux/kirkwood/patches-4.4/190-nsa310s.patch
+++ b/target/linux/kirkwood/patches-4.4/190-nsa310s.patch
@@ -260,7 +260,7 @@
 +	};
 +
 +	partition@200000 {
-+		label = "root";
++		label = "ubi";
 +		reg = <0x200000 0x7e00000>;
 +	};
 +};
-- 
2.30.2