X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e403a481de8e872d3e501a22d6d5d28a14d9fa07..840c30e693f906b4aa54578f948ec10c32b36536:/target/linux/image/jffs2.mk

diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index fb8feab47..dd5edd01c 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -1,41 +1,26 @@
+ifneq ($(CONFIG_BIG_ENDIAN),y)
 JFFS2OPTS :=  --pad --little-endian --squash
-#JFFS2OPTS += -Xlzo -msize -Xlzari
-
-jffs2-prepare:
-	$(MAKE) -C jffs2 prepare $(MAKE_TRACE)
-
-jffs2-compile: prepare-targets
-	$(MAKE) -C jffs2 compile $(MAKE_TRACE)
-
-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 $(MAKE_TRACE)
+else
+JFFS2OPTS :=  --pad --big-endian --squash
+endif
 
-$(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)
+define Image/mkfs/jffs2
+	rm -rf $(BUILD_DIR)/root/jffs
+	
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
 
-ifeq ($(IB),)
-jffs2-install: compile-targets $(BOARD)-compile
-endif
+	$(call Image/Build,jffs2-64k)
+	$(call Image/Build,jffs2-128k)
+endef
 
-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"
+$(STAGING_DIR)/bin/mkfs.jffs2:
+	$(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile
 
-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
+jffs2-clean: FORCE
+	$(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean
+	rm -f $(KDIR)/root.jffs2*
 
-prepare-targets: jffs2-prepare
-compile-targets: jffs2-compile
-install-targets: jffs2-install
-install-ib: jffs2-install-ib
+compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2
 clean-targets: jffs2-clean