From 72823077cdabdb6b3432a254d413000d00630634 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Tue, 5 Jun 2007 20:55:21 +0000
Subject: [PATCH] add support for jffs2 filesystems with 256k blocksize, fix
 taishan support

SVN-Revision: 7506
---
 include/image.mk                     | 3 +++
 target/linux/amcc-2.6/Makefile       | 2 +-
 target/linux/amcc-2.6/image/Makefile | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 815f01ba02..08f240fe23 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -38,14 +38,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 		
 		$(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)
     endef
   endif
     
diff --git a/target/linux/amcc-2.6/Makefile b/target/linux/amcc-2.6/Makefile
index 935e639a53..58d739df10 100644
--- a/target/linux/amcc-2.6/Makefile
+++ b/target/linux/amcc-2.6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=powerpc
 BOARD:=amcc
 BOARDNAME:=AMCC Taishan
-FEATURES:=squashfs broken
+FEATURES:=jffs2
 
 define Target/Description
 	Build firmware images for the AMCC Taishan evaluation board
diff --git a/target/linux/amcc-2.6/image/Makefile b/target/linux/amcc-2.6/image/Makefile
index bab2e647ee..bd391f02f2 100644
--- a/target/linux/amcc-2.6/image/Makefile
+++ b/target/linux/amcc-2.6/image/Makefile
@@ -19,6 +19,13 @@ define Image/Build
 	$(call Image/Build/$(1),$(1))
 endef
 
+define Image/Build/jffs2-256k
+	( \
+		dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
+	) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-jffs2.img
+endef
+
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 	( \
-- 
2.30.2