From eec23618ad2acede20c835f962b682acc1f13de9 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 19 Jul 2009 06:42:30 +0000
Subject: [PATCH] increase linux partition size, and fix jffs2 images

SVN-Revision: 16906
---
 target/linux/ppc40x/image/Makefile              | 17 ++++++++++-------
 .../ppc40x/patches-2.6.30/005-magicboxv1.patch  |  6 +++---
 .../ppc40x/patches-2.6.30/006-magicboxv2.patch  |  6 +++---
 .../linux/ppc40x/patches/005-magicboxv1.patch   |  6 +++---
 .../linux/ppc40x/patches/006-magicboxv2.patch   |  6 +++---
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/target/linux/ppc40x/image/Makefile b/target/linux/ppc40x/image/Makefile
index b54cc06488..a5be9be92a 100644
--- a/target/linux/ppc40x/image/Makefile
+++ b/target/linux/ppc40x/image/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-JFFS2_BLOCKSIZE=128k
+JFFS2_BLOCKSIZE=128k 64k
 
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage
@@ -28,13 +28,16 @@ define Image/Build/jffs2-128k
 		dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-jffs2.img
+endef
+
+define Image/Build/jffs2-64k
 	( \
-		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-jffs2.img
 	( \
-		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1024k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-jffs2.img
 endef
 
@@ -46,11 +49,11 @@ define Image/Build/squashfs
 		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-$(1).img
 	( \
-		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1024k conv=sync; \
+		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-$(1).img
 	( \
-		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1024k conv=sync; \
+		dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
 	) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-$(1).img
 endef
diff --git a/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch b/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
index ef29e0bf29..062bbdbceb 100644
--- a/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
+++ b/target/linux/ppc40x/patches-2.6.30/005-magicboxv1.patch
@@ -204,11 +204,11 @@
 +				#size-cells = <1>;
 +				partition@0 {
 +					label = "linux";
-+					reg = <0x0 0x3c0000>;
++					reg = <0x0 0x120000>;
 +				};
-+				partition@100000 {
++				partition@120000 {
 +					label = "rootfs";
-+					reg = <0x100000 0x2c0000>;
++					reg = <0x120000 0x2a0000>;
 +				};
 +				partition@3c0000 {
 +					label = "u-boot";
diff --git a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
index 8a7dbb6aef..1fa74b8890 100644
--- a/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
+++ b/target/linux/ppc40x/patches-2.6.30/006-magicboxv2.patch
@@ -238,11 +238,11 @@
 +				#size-cells = <1>;
 +				partition@0 {
 +					label = "linux";
-+					reg = <0x0 0x3c0000>;
++					reg = <0x0 0x120000>;
 +				};
-+				partition@100000 {
++				partition@120000 {
 +					label = "rootfs";
-+					reg = <0x100000 0x2c0000>;
++					reg = <0x120000 0x2a0000>;
 +				};
 +				partition@3c0000 {
 +					label = "u-boot";
diff --git a/target/linux/ppc40x/patches/005-magicboxv1.patch b/target/linux/ppc40x/patches/005-magicboxv1.patch
index 331fc5ff19..582a6e833f 100644
--- a/target/linux/ppc40x/patches/005-magicboxv1.patch
+++ b/target/linux/ppc40x/patches/005-magicboxv1.patch
@@ -203,11 +203,11 @@
 +				#size-cells = <1>;
 +				partition@0 {
 +					label = "linux";
-+					reg = <0x0 0x3c0000>;
++					reg = <0x0 0x120000>;
 +				};
-+				partition@100000 {
++				partition@120000 {
 +					label = "rootfs";
-+					reg = <0x100000 0x2c0000>;
++					reg = <0x120000 0x2a0000>;
 +				};
 +				partition@3c0000 {
 +					label = "u-boot";
diff --git a/target/linux/ppc40x/patches/006-magicboxv2.patch b/target/linux/ppc40x/patches/006-magicboxv2.patch
index 33831af5d3..8dd283faa6 100644
--- a/target/linux/ppc40x/patches/006-magicboxv2.patch
+++ b/target/linux/ppc40x/patches/006-magicboxv2.patch
@@ -237,11 +237,11 @@
 +				#size-cells = <1>;
 +				partition@0 {
 +					label = "linux";
-+					reg = <0x0 0x3c0000>;
++					reg = <0x0 0x120000>;
 +				};
-+				partition@100000 {
++				partition@120000 {
 +					label = "rootfs";
-+					reg = <0x100000 0x2c0000>;
++					reg = <0x120000 0x2a0000>;
 +				};
 +				partition@3c0000 {
 +					label = "u-boot";
-- 
2.30.2