X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8f37c266a301fd8ff423018d9c8aa8360331977d..b22fc6894887891ad39b8a09daabf602c4d38d95:/target/linux/image/jffs2.mk?ds=sidebyside

diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 02c56817b..b6396e66a 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -1,30 +1,46 @@
+ifneq ($(BR2_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) -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:
+$(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:
+$(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)
+
+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"
 
-prepare: jffs2-prepare
-compile: jffs2-compile
-install: jffs2-install
-clean: jffs2-clean
+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-targets: jffs2-prepare
+compile-targets: jffs2-compile
+install-targets: jffs2-install
+install-ib: jffs2-install-ib
+clean-targets: jffs2-clean