re-add state match to kernel image

[openwrt.git] / openwrt / target / jffs2 / Makefile

diff --git a/openwrt/target/jffs2/Makefile b/openwrt/target/jffs2/Makefile
index ff63e6f..40acb10 100644 (file)
--- a/openwrt/target/jffs2/Makefile
+++ b/openwrt/target/jffs2/Makefile
@@ -1,36 +1,47 @@
 include $(TOPDIR)/rules.mk
 
-include ./jffs2root.mk
-
-TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
-
+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
+MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
+MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2
+JFFS2OPTS :=  --pad --little-endian --squash 
+#JFFS2OPTS += -Xlzo -msize -Xlzari
+
+$(DL_DIR)/$(MTD_SOURCE):
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE)
+
+$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
+       zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+       touch $(MTD_DIR)/.unpacked
+
+$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked
+       $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
+
+$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2
+       cp $< $@
+
+define jffs2-4MB_template
+       @rm -rf $(1)/root/jffs
+       $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x10000 -o $(1)/root.jffs2-4MB -d $(1)/root
+       PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
+        $(1)/kernel-image -a 0x10000 $(1)/root.jffs2-4MB
+endef
+
+define jffs2-8MB_template
+       @rm -rf $(1)/root/jffs
+       $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x20000 -o $(1)/root.jffs2-8MB -d $(1)/root
+       PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
+        $(1)/kernel-image -a 0x10000 $(1)/root.jffs2-8MB
+endef
+
+FILESYSTEMS:=jffs2-4MB jffs2-8MB
+include ../image.mk
+
+source: $(DL_DIR)/$(MTD_SOURCE)
 prepare: $(MTD_DIR)/.unpacked
-compile: mtd
-install: compile $(TARGETS)
-clean: jffs2root-dirclean
-
-$(BIN_DIR)/openwrt-generic-jffs2-4MB.trx:
-       $(MKFS_JFFS2) --pad --little-endian --squash -e 0x10000 \
-               -d $(TARGET_DIR) -o $(IMAGE)-4MB.jffs2
-       PATH=$(TARGET_PATH) trx -o $@ \
-        $(LINUX_KERNEL) -a 0x10000 $(IMAGE)-4MB.jffs2
-
-$(BIN_DIR)/openwrt-generic-jffs2-8MB.trx:
-       $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
-               -d $(TARGET_DIR) -o $(IMAGE)-8MB.jffs2
-       PATH=$(TARGET_PATH) trx -o $@ \
-        $(LINUX_KERNEL) -a 0x20000 $(IMAGE)-8MB.jffs2
-        
-$(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $< -o $@ -g
-       $(SED) "1s,^W54S,W54G," $@
-       
-$(BIN_DIR)/openwrt-wrt54gs-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $< -o $@ -g
-
-$(BIN_DIR)/openwrt-motorola-jffs2-4MB.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
-       PATH=$(TARGET_PATH) motorola-bin $< $@
-
-$(BIN_DIR)/openwrt-motorola-jffs2-8MB.bin: $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
-       PATH=$(TARGET_PATH) motorola-bin $< $@
+compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2
+install: 
+clean:
+       rm -rf $(MTD_DIR)