KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't use lzma/jffs2 on <2.6.33, set lzma/jffs2 as default for >=2.6.33. switch verbose mode on compresor statistics.

Browse source 
SVN-Revision: 20844
This commit is contained in:
Alexandros C. Couloumbis 2010-04-13 21:36:58 +00:00
parent e438c665db
commit 668fd62080
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/image.mk
View file

@ -18,17 +18,31 @@ KDIR=$(KERNEL_BUILD_DIR)
IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
ifneq ($(CONFIG_BIG_ENDIAN),y)
JFFS2OPTS := --pad --little-endian --squash
JFFS2OPTS := --pad --little-endian --squash -v
SQUASHFS_OPTS := -le
else
JFFS2OPTS := --pad --big-endian --squash
JFFS2OPTS := --pad --big-endian --squash -v
SQUASHFS_OPTS := -be
endif
JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_RTIME)$(LINUX_2_4),-X,-x) rtime
JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_ZLIB),-X,-x) zlib
JFFS2OPTS+= $(if $(CONFIG_KERNEL_JFFS2_LZMA)$(LINUX_2_4),-X,-x) lzma
JFFS2OPTS+= $(JFFS2COMPR) --compression-mode=size
ifeq ($(CONFIG_JFFS2_RTIME),y)
JFFS2OPTS+= -X rtime
endif
ifeq ($(CONFIG_JFFS2_ZLIB),y)
JFFS2OPTS+= -X zlib
endif
ifeq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS+= -X lzma --compression-mode=size
endif
ifneq ($(CONFIG_JFFS2_RTIME),y)
JFFS2OPTS+= -x rtime
endif
ifneq ($(CONFIG_JFFS2_ZLIB),y)
JFFS2OPTS+= -x zlib
endif
ifneq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS+= -x lzma
endif
ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25),)
USE_SQUASHFS3 := y

3
target/linux/generic-2.6/config-2.6.33
View file

@ -1107,7 +1107,8 @@ CONFIG_JFFS2_FS=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_ZLIB=y
#CONFIG_JFFS2_ZLIB is not set
CONFIG_JFFS2_LZMA=y
# CONFIG_JFFS_FS is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_FS is not set

3
target/linux/generic-2.6/config-2.6.34
View file

@ -1110,7 +1110,8 @@ CONFIG_JFFS2_FS=y
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_ZLIB=y
#CONFIG_JFFS2_ZLIB is not set
CONFIG_JFFS2_LZMA=y
# CONFIG_JFFS_FS is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_FS is not set