From b4ecda7b3fd6ac7a92a03e8ec83c45fb17f8f125 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Thu, 14 Nov 2013 01:35:21 +0000 Subject: [PATCH] image: don't force ubifs journal size Small journal size can lead to problems if nand flash is too big. By default ubifs will use ~12% of volume size or a maximum of 8MiB. Signed-off-by: Luka Perkov SVN-Revision: 38799 --- Config.in | 2 +- include/image.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index d6573a6fb7..ea5f8eae2b 100644 --- a/Config.in +++ b/Config.in @@ -143,7 +143,7 @@ menu "Target Images" config TARGET_UBIFS_JOURNAL_SIZE string prompt "journal size" if TARGET_ROOTFS_UBIFS - default "512KiB" + default "" config TARGET_UBIFS_SQUASH_UIDS bool "squash uids" if TARGET_ROOTFS_UBIFS diff --git a/include/image.mk b/include/image.mk index 71822de980..aa565951a9 100644 --- a/include/image.mk +++ b/include/image.mk @@ -142,7 +142,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ - --jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE) \ + $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ --squash-uids \ -o $(KDIR)/root.ubifs \ -d $(TARGET_DIR)