X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/85e741f25f8496ba7b99e1fbb8d881585d1d6baf..c87e42acd40e3bf7874571ccc514e3668ec18386:/openwrt/target/jffs2/jffs2root.mk

diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index 7d30f4cc9..5a0259b27 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/target/jffs2/jffs2root.mk
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-MTD_DIR:=$(BUILD_DIR)/mtd-20011217
-MTD_SOURCE=mtd_20011217.orig.tar.gz
+MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig
+MTD_SOURCE=mtd_20050122.orig.tar.gz
 MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd
 MKFS_JFFS2=$(shell which mkfs.jffs2 2>/dev/null || echo $(MTD_DIR)/util/mkfs.jffs2)
 
@@ -17,7 +17,6 @@ $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
 	touch $(MTD_DIR)/.unpacked
 
 $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked
-#	CFLAGS=-I$(LINUX_HEADERS_DIR)/include $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
 	$(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
 
 mtd: $(MKFS_JFFS2)
@@ -30,11 +29,10 @@ mtd: $(MKFS_JFFS2)
 #############################################################
 
 jffs2root: mtd
-	#-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
-	$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
+	$(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \
 		-d $(TARGET_DIR) -o $(IMAGE).jffs2
 
 jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
@@ -45,15 +43,14 @@ jffs2root-clean:
 jffs2root-dirclean:
 	rm -rf $(MTD_DIR)
 
-openwrt-linux.trx.jffs2:
-	$(BUILD_DIR)/trx -o openwrt-linux.trx.jffs2 $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).jffs2
-
-openwrt-gs-code.bin.jffs2: openwrt-linux.trx.jffs2
-	$(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.jffs2 -o openwrt-gs-code.bin.jffs2 -g
-
-openwrt-g-code.bin.jffs2: openwrt-gs-code.bin.jffs2
-	sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.jffs2 > openwrt-g-code.bin.jffs2
-
-openwrt-image-jffs2:	openwrt-g-code.bin.jffs2
-
-
+ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
+TARGETS+=openwrt-jffs2root openwrt-image
+ROOTFS=jffs2
+JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE)
+
+openwrt-image: openwrt
+	@make jffs2root openwrt-code.bin TAG=W54G \
+	EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000
+	@make jffs2root openwrt-code.bin TAG=W54S \
+	EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000
+endif