summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-05 20:55:21 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-05 20:55:21 +0000
commit035104fa52869536501ea29c7a25be389da3d2c2 (patch)
tree9ca0bc5a0c5feed217f8303abe6eedeb847ec38f
parent463c4d86fe6b5a6b58cf6e2d69da781a7876654f (diff)
add support for jffs2 filesystems with 256k blocksize, fix taishan support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7506 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/image.mk3
-rw-r--r--target/linux/amcc-2.6/Makefile2
-rw-r--r--target/linux/amcc-2.6/image/Makefile7
3 files changed, 11 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk
index 815f01ba0..08f240fe2 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 935e639a5..58d739df1 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 bab2e647e..bd391f02f 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)
( \