diff options
Diffstat (limited to 'target/jffs2')
| -rw-r--r-- | target/jffs2/Makefile | 17 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 7 |
2 files changed, 7 insertions, 17 deletions
diff --git a/target/jffs2/Makefile b/target/jffs2/Makefile index 0e14ac6f2a..5925a9e123 100644 --- a/target/jffs2/Makefile +++ b/target/jffs2/Makefile @@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk include ./jffs2root.mk -TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx +JFFS2_TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx JFFS2OPTS := --pad --little-endian --squash -d $(TARGET_DIR) #JFFS2OPTS += -Xlzo -msize -Xlzari prepare: $(MTD_DIR)/.unpacked compile: mtd -install: compile $(TARGETS) +install: compile $(JFFS2_TARGETS) clean: jffs2root-dirclean $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx: @@ -21,16 +21,3 @@ $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx: PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \ $(LINUX_IMAGE) -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 $< $@ - diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index c1d31e4106..6ed7a375c6 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -8,7 +8,7 @@ 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=$(shell which mkfs.jffs2 2>/dev/null || echo $(MTD_DIR)/util/mkfs.jffs2) +MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 $(DL_DIR)/$(MTD_SOURCE): $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE) @@ -20,7 +20,10 @@ $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util -mtd: $(MKFS_JFFS2) +$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 + cp $< $@ + +mtd: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 ############################################################# |