backport flash-map driver and serial setup from 2.6 for netgear wgt634, split flash...

[openwrt.git] / openwrt / target / linux / image / jffs2.mk

diff --git a/openwrt/target/linux/image/jffs2.mk b/openwrt/target/linux/image/jffs2.mk
index ab8cfbe..fb8feab 100644 (file)
--- a/openwrt/target/linux/image/jffs2.mk
+++ b/openwrt/target/linux/image/jffs2.mk
@@ -2,36 +2,40 @@ JFFS2OPTS :=  --pad --little-endian --squash
 #JFFS2OPTS += -Xlzo -msize -Xlzari
 
 jffs2-prepare:
-       $(MAKE) -C jffs2 prepare
+       $(MAKE) -C jffs2 prepare $(MAKE_TRACE)
 
-jffs2-compile:
-       $(MAKE) -C jffs2 compile
+jffs2-compile: prepare-targets
+       $(MAKE) -C jffs2 compile $(MAKE_TRACE)
 
 jffs2-clean:
-       $(MAKE) -C jffs2 clean
+       $(MAKE) -C jffs2 clean $(MAKE_TRACE)
        rm -f $(KDIR)/root.jffs2*
 
 $(KDIR)/root.jffs2-4MB: install-prepare
        @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
 
 $(KDIR)/root.jffs2-8MB: install-prepare
        @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
 
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
+ifeq ($(IB),)
+jffs2-install: compile-targets $(BOARD)-compile
+endif
+
+jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
        $(TRACE) target/linux/image/$(BOARD)/install
        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
        $(TRACE) target/linux/image/$(BOARD)/install
        $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
 
-jffs2-install-ib:
+jffs2-install-ib: compile-targets
        mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
        cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
 
-prepare: jffs2-prepare
-compile: jffs2-compile
-install: jffs2-install
+prepare-targets: jffs2-prepare
+compile-targets: jffs2-compile
+install-targets: jffs2-install
 install-ib: jffs2-install-ib
-clean: jffs2-clean
+clean-targets: jffs2-clean