From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Mar 2016 08:33:17 +0000 (+0000)
Subject: ramips: mt7621: fix WF-2881 for ubi split
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=11d7d468a12a5bf917d4f76e78f4ef3a0db37f80

ramips: mt7621: fix WF-2881 for ubi split

This patch fix firmware split for WF-2881 which was previously manually partitioned.

Signed-off-by: YounJae Rho <luxflow@live.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48908 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index aaafe5af82..d33436c64a 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -48,19 +48,9 @@
 			read-only;
 		};
 
-		firmware {
-			label = "firmware";
-			reg = <0x140000 0x6EC0000>;
-		};
-
 		partition@140000 {
-			label = "kernel";
-			reg = <0x140000 0x200000>;
-		};
-
-		partition@340000 {
-			label = "ubi";
-			reg = <0x340000 0x6CC0000>;
+			label = "firmware";
+			reg = <0x140000 0x7E40000>;
 		};
 	};
 
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index eb50cddeaf..f5e8e58ef9 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -1115,9 +1115,10 @@ define Device/wf-2881
   DTS := WF-2881
   BLOCKSIZE := 128KiB
   PAGESIZE := 2048
-  KERNEL_SIZE := 2097152
   FILESYSTEMS := squashfs
-  IMAGE/sysupgrade.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
+  IMAGE_SIZE := 132382720
+  KERNEL := $(KERNEL_DTB) | pad-offset 131072 64 | uImage lzma
+  IMAGE/sysupgrade.bin := append-kernel | append-ubi | check-size $$$$(IMAGE_SIZE)
 endef
 
 define Device/ubnt-erx