From e9241844a8103b62775040cdb35c09002e904fb5 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 17 Feb 2014 19:09:03 +0100 Subject: Kconfig: Select default compression type Instead of asking explicitly for the default environment compression type ask for the in-barebox default compression type. This also adds a DEFAULT_COMPRESSION_SUFFIX make variable which can be used together with the wildcard rules for compressed files to generate compressed files without explicitly support each compression type. Signed-off-by: Sascha Hauer --- common/Makefile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'common/Makefile') diff --git a/common/Makefile b/common/Makefile index 60b0356df4..3cfaae2e72 100644 --- a/common/Makefile +++ b/common/Makefile @@ -76,22 +76,11 @@ cmd_envs = ($(srctree)/scripts/genenv $(srctree) $(objtree) $@ $(DEFAULT_ENVIRON $(obj)/barebox_default_env: FORCE $(call cmd,envs) -barebox_default_env_comp = -ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED_GZIP),y) -barebox_default_env_comp = .gz -endif -ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED_BZIP2),y) -barebox_default_env_comp = .bz2 -endif -ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_COMPRESSED_LZO),y) -barebox_default_env_comp = .lzo -endif - quiet_cmd_env_h = ENVH $@ cmd_env_h = cat $< | (cd $(obj) && $(objtree)/scripts/bin2c default_environment) > $@; \ echo "static const int default_environment_uncompress_size=`stat -c%s $(obj)/barebox_default_env`;" >> $@ -$(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(barebox_default_env_comp) FORCE +$(obj)/barebox_default_env.h: $(obj)/barebox_default_env$(DEFAULT_COMPRESSION_SUFFIX) FORCE $(call if_changed,env_h) quiet_cmd_pwd_h = PWDH $@ -- cgit v1.2.3