X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3d80c3754b3421428b47f89ce26f07adf10e7501..113c33218bee58084f41f4980b56388d0fe30f30:/openwrt/target/jffs2/jffs2root.mk

diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index 5dd79032f..9846d001f 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/target/jffs2/jffs2root.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 
-MTD_DIR:=$(BUILD_DIR)/mtd-20011217
-MTD_SOURCE=mtd_20011217.orig.tar.gz
+include target/jffs2/blocksize.mk
+
+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 +19,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,13 +31,11 @@ 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 \
-		-D target/default/device_table.txt -d $(TARGET_DIR) \
-		-o $(IMAGE).jffs2
+	$(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \
+		-d $(TARGET_DIR) -o $(IMAGE).jffs2
 
 jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
 
@@ -46,5 +45,7 @@ jffs2root-clean:
 jffs2root-dirclean:
 	rm -rf $(MTD_DIR)
 
-
-
+ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
+TARGETS+=jffs2root openwrt-image
+ROOTFS=jffs2
+endif