X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/99ba699421c041858df7fcb50379e3b21798ae12..3b1fa8d2b985eecfd3859e4694ba66193163fd2e:/include/image.mk

diff --git a/include/image.mk b/include/image.mk
index 0e6a7cdbe..5fc87efa1 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -7,6 +7,7 @@
 
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/host.mk
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 ifneq ($(CONFIG_BIG_ENDIAN),y)
@@ -17,6 +18,8 @@ JFFS2OPTS     :=  --pad --big-endian --squash
 SQUASHFS_OPTS :=  -be
 endif
 
+JFFS2_BLOCKSIZE ?= 64k 128k
+
 define add_jffs2_mark
 	echo -ne '\xde\xad\xc0\xde' >> $(1)
 endef
@@ -35,16 +38,11 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     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
-
-		
-		# add End-of-Filesystem markers
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-64k)
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-128k)
-	
-		$(call Image/Build,jffs2-64k)
-		$(call Image/Build,jffs2-128k)
+		$(foreach SZ,$(JFFS2_BLOCKSIZE),\
+			$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
+			$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
+			$(call Image/Build,jffs2-$(SZ)) \
+		)
     endef
   endif
     
@@ -58,12 +56,13 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     
   ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
     define Image/mkfs/tgz
-		tar -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
+		$(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
     endef
   endif
 else
   define Image/BuildKernel
 	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf
+	$(call Image/Build/Initramfs)
   endef
 endif
 
@@ -79,9 +78,9 @@ endif
 
 
 define Image/mkfs/prepare/default
-	find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | xargs -r chmod 0644
-	find $(BUILD_DIR)/root -type f -perm +0100 | xargs -r chmod 0755
-	find $(BUILD_DIR)/root -type d | xargs -r chmod 0755
+	find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | $(XARGS) chmod 0644
+	find $(BUILD_DIR)/root -type f -perm +0100 | $(XARGS) chmod 0755
+	find $(BUILD_DIR)/root -type d | $(XARGS) chmod 0755
 	mkdir -p $(BUILD_DIR)/root/tmp
 	chmod 0777 $(BUILD_DIR)/root/tmp
 endef