Author: luka
Date: 2016-03-14 18:06:14 +0100 (Mon, 14 Mar 2016)
New Revision: 49014

Added:
   trunk/target/linux/kirkwood/patches-3.18/181-goflexnet.patch
Modified:
   trunk/target/linux/kirkwood/patches-3.18/180-goflexhome.patch
Log:
kirkwood/goflexhome/goflexnet: merge "root" and unused mtd partitions into one 
volume "ubi"

The kernel will automatic attach mtd partitions named 'ubi' to ubi0.
Renaming the "root" partition into "ubi" will safe arguments
from the kernel cmdline.

Signed-off-by: Alexander Couzens <[email protected]>

Modified: trunk/target/linux/kirkwood/patches-3.18/180-goflexhome.patch
===================================================================
--- trunk/target/linux/kirkwood/patches-3.18/180-goflexhome.patch       
2016-03-14 17:06:12 UTC (rev 49013)
+++ trunk/target/linux/kirkwood/patches-3.18/180-goflexhome.patch       
2016-03-14 17:06:14 UTC (rev 49014)
@@ -1,5 +1,7 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
+Index: linux-3.18.27/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.18.27.orig/arch/arm/boot/dts/Makefile
++++ linux-3.18.27/arch/arm/boot/dts/Makefile
 @@ -120,6 +120,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-
        kirkwood-ds411.dtb \
        kirkwood-ds411j.dtb \
@@ -8,9 +10,11 @@
        kirkwood-goflexnet.dtb \
        kirkwood-guruplug-server-plus.dtb \
        kirkwood-ib62x0.dtb \
+Index: linux-3.18.27/arch/arm/boot/dts/kirkwood-goflexhome.dts
+===================================================================
 --- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
-@@ -0,0 +1,127 @@
++++ linux-3.18.27/arch/arm/boot/dts/kirkwood-goflexhome.dts
+@@ -0,0 +1,117 @@
 +/dts-v1/;
 +
 +#include "kirkwood.dtsi"
@@ -109,19 +113,9 @@
 +      };
 +
 +      partition@100000 {
-+              label = "uImage";
-+              reg = <0x0100000 0x400000>;
++              label = "ubi";
++              reg = <0x100000 0xfc00000>;
 +      };
-+
-+      partition@500000 {
-+              label = "pogoplug";
-+              reg = <0x0500000 0x2000000>;
-+      };
-+
-+      partition@2500000 {
-+              label = "root";
-+              reg = <0x02500000 0xd800000>;
-+      };
 +};
 +
 +&mdio {

Added: trunk/target/linux/kirkwood/patches-3.18/181-goflexnet.patch
===================================================================
--- trunk/target/linux/kirkwood/patches-3.18/181-goflexnet.patch                
                (rev 0)
+++ trunk/target/linux/kirkwood/patches-3.18/181-goflexnet.patch        
2016-03-14 17:06:14 UTC (rev 49014)
@@ -0,0 +1,25 @@
+Index: linux-4.4.4/arch/arm/boot/dts/kirkwood-goflexnet.dts
+===================================================================
+--- linux-4.4.4.orig/arch/arm/boot/dts/kirkwood-goflexnet.dts
++++ linux-4.4.4/arch/arm/boot/dts/kirkwood-goflexnet.dts
+@@ -158,18 +158,8 @@
+       };
+ 
+       partition@100000 {
+-              label = "uImage";
+-              reg = <0x0100000 0x400000>;
+-      };
+-
+-      partition@500000 {
+-              label = "pogoplug";
+-              reg = <0x0500000 0x2000000>;
+-      };
+-
+-      partition@2500000 {
+-              label = "root";
+-              reg = <0x02500000 0xd800000>;
++              label = "ubi";
++              reg = <0x0100000 0xfc00000>;
+       };
+ };
+ 
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to