add support for jffs2 filesystems with 256k blocksize, fix taishan support

SVN-Revision: 7506

diff --git a/include/image.mk b/include/image.mk
index 815f01ba029e48d3962b2f30283f4923005ab1bf..08f240fe238135e9ae18cb4d895f5f65459c6421 100644 (file)
--- 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 935e639a5307dee97c3327af9650d2340fdbe768..58d739df10e45b66781e78524c4291518c8ef64b 100644 (file)
--- 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 bab2e647eee5b7b18b1aacc2f60ea1f38cedddbc..bd391f02f2c0258733f77798e98a6d5dba9cd3c5 100644 (file)
--- 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)
        ( \