summaryrefslogtreecommitdiffstats
path: root/target/linux/image/jffs2.mk
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-04 21:57:59 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-04 21:57:59 +0000
commitff69288edb1c2ef75c0ebb4a2dc159b82b92a3c5 (patch)
tree4e4ebb4786454272f73ed7e3ea76e57ea789de41 /target/linux/image/jffs2.mk
parentbf82d1e1fa09243728f245651ded9b8fbd6d3f09 (diff)
target/linux/image rewrite
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/image/jffs2.mk')
-rw-r--r--target/linux/image/jffs2.mk42
1 files changed, 12 insertions, 30 deletions
diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index c1d07a22b..dd5edd01c 100644
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -4,41 +4,23 @@ else
JFFS2OPTS := --pad --big-endian --squash
endif
-#JFFS2OPTS += -Xlzo -msize -Xlzari
+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
-jffs2-prepare: FORCE
- $(MAKE) -C jffs2 prepare
+ $(call Image/Build,jffs2-64k)
+ $(call Image/Build,jffs2-128k)
+endef
-jffs2-compile: prepare-targets
- $(MAKE) -C jffs2 compile
+$(STAGING_DIR)/bin/mkfs.jffs2:
+ $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile
jffs2-clean: FORCE
- $(MAKE) -C jffs2 clean
+ $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean
rm -f $(KDIR)/root.jffs2*
-$(KDIR)/root.jffs2-4MB: install-prepare
- @rm -rf $(BUILD_DIR)/root/jffs
- $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(BUILD_DIR)/root
-
-$(KDIR)/root.jffs2-8MB: install-prepare
- @rm -rf $(BUILD_DIR)/root/jffs
- $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(BUILD_DIR)/root
-
-ifeq ($(IB),)
-jffs2-install: compile-targets $(BOARD)-compile
-endif
-
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB FORCE
- $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
- $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
-
-jffs2-install-ib: compile-targets FORCE
- 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
+compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2
clean-targets: jffs2-clean