fix BR2_ and CONFIG_ issues

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

diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 6d6469d..7df3aed 100644 (file)
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -1,33 +1,40 @@
+ifneq ($(CONFIG_mips),y)
 JFFS2OPTS :=  --pad --little-endian --squash
+else
+JFFS2OPTS :=  --pad --big-endian --squash
+endif
+
 #JFFS2OPTS += -Xlzo -msize -Xlzari
 
 jffs2-prepare:
-       $(MAKE) -C jffs2 prepare $(MAKE_TRACE)
+       $(MAKE) -C jffs2 prepare
 
 jffs2-compile: prepare-targets
-       $(MAKE) -C jffs2 compile $(MAKE_TRACE)
+       $(MAKE) -C jffs2 compile
 
 jffs2-clean:
-       $(MAKE) -C jffs2 clean $(MAKE_TRACE)
+       $(MAKE) -C jffs2 clean
        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 $(MAKE_TRACE)
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
 
 $(KDIR)/root.jffs2-8MB: install-prepare
        @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
+
+ifeq ($(IB),)
+jffs2-install: compile-targets $(BOARD)-compile
+endif
 
-jffs2-install: compile-targets $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile
-       $(TRACE) target/linux/image/$(BOARD)/install
+jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
        $(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
+       $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
 
 prepare-targets: jffs2-prepare
 compile-targets: jffs2-compile