From 261fc738ccc74f28767ad70f0004c5c0fdcf312f Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 25 Sep 2013 20:03:20 +0000 Subject: image: generate separate jffs2 images w/o padding The new root.jffs2-*-raw images can be used for firmware images with custom padding requirements. Signed-off-by: Gabor Juhos SVN-Revision: 38196 --- include/image.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 2f75e74d69..5d512df38d 100644 --- a/include/image.mk +++ b/include/image.mk @@ -20,9 +20,9 @@ IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt ifneq ($(CONFIG_BIG_ENDIAN),) - JFFS2OPTS := --pad --big-endian --squash-uids -v + JFFS2OPTS := --big-endian --squash-uids -v else - JFFS2OPTS := --pad --little-endian --squash-uids -v + JFFS2OPTS := --little-endian --squash-uids -v endif ifeq ($(CONFIG_JFFS2_RTIME),y) @@ -84,7 +84,8 @@ endif define Image/mkfs/jffs2/sub # FIXME: removing this line will cause strange behaviour in the foreach loop below - $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) --pad -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2)-raw -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2)) $(call Image/Build,jffs2-$(2)) endef -- cgit v1.2.3