From e8918b0f6646acd87583bc575375bb13960e3c83 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 16 Jul 2007 22:06:45 +0000
Subject: [PATCH] better support for handling various jffs2 eraseblock sizes

SVN-Revision: 8011
---
 include/image.mk                     | 20 +++++++-------------
 target/linux/amcc-2.6/image/Makefile |  2 ++
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index 84549c554383..5fc87efa1d95 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -18,6 +18,8 @@ JFFS2OPTS     :=  --pad --big-endian --squash
 SQUASHFS_OPTS :=  -be
 endif
 
+JFFS2_BLOCKSIZE ?= 64k 128k
+
 define add_jffs2_mark
 	echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
@@ -36,19 +38,11 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     define Image/mkfs/jffs2
 		rm -rf $(BUILD_DIR)/root/jffs
 		
-		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
-		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
-		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x40000 -o $(KDIR)/root.jffs2-256k -d $(BUILD_DIR)/root
-
-		
-		# add End-of-Filesystem markers
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-64k)
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-128k)
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-256k)
-	
-		$(call Image/Build,jffs2-64k)
-		$(call Image/Build,jffs2-128k)
-		$(call Image/Build,jffs2-256k)
+		$(foreach SZ,$(JFFS2_BLOCKSIZE),\
+			$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
+			$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
+			$(call Image/Build,jffs2-$(SZ)) \
+		)
     endef
   endif
     
diff --git a/target/linux/amcc-2.6/image/Makefile b/target/linux/amcc-2.6/image/Makefile
index bd391f02f2c0..09ff061dba18 100644
--- a/target/linux/amcc-2.6/image/Makefile
+++ b/target/linux/amcc-2.6/image/Makefile
@@ -7,6 +7,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+JFFS2_BLOCKSIZE=256k
+
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage
 endef
-- 
2.30.2