diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:40 +0100 |
| commit | 4df69d0b6e79a6c0633921117803802c24020cc3 (patch) | |
| tree | 6bc294cb3eb8769fe584c72a63d5630999838c47 /Makefile | |
| parent | fbf087808b55b542101654fe838c2db131aa9660 (diff) | |
| parent | 66a1d213e04748a77170374c35f21f5b176837de (diff) | |
| download | barebox-4df69d0b6e79a6c0633921117803802c24020cc3.tar.gz barebox-4df69d0b6e79a6c0633921117803802c24020cc3.tar.xz | |
Merge branch 'for-next/env'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -493,6 +493,7 @@ all: barebox-flash-image $(KBUILD_DTBS) endif common-$(CONFIG_PBL_IMAGE) += pbl/ +common-$(CONFIG_DEFAULT_ENVIRONMENT) += defaultenv/ barebox-dirs := $(patsubst %/,%,$(filter %/, $(common-y))) @@ -504,6 +505,23 @@ barebox-alldirs := $(sort $(barebox-dirs) $(patsubst %/,%,$(filter %/, \ pbl-common-y := $(patsubst %/, %/built-in-pbl.o, $(common-y)) common-y := $(patsubst %/, %/built-in.o, $(common-y)) +ifeq ($(CONFIG_DEFAULT_COMPRESSION_GZIP),y) +DEFAULT_COMPRESSION_SUFFIX := .gz +endif +ifeq ($(CONFIG_DEFAULT_COMPRESSED_BZIP2),y) +DEFAULT_COMPRESSION_SUFFIX := .bz2 +endif +ifeq ($(CONFIG_DEFAULT_COMPRESSION_LZO),y) +DEFAULT_COMPRESSION_SUFFIX := .lzo +endif +ifeq ($(CONFIG_DEFAULT_COMPRESSION_LZ4),y) +DEFAULT_COMPRESSION_SUFFIX := .lz4 +endif +ifeq ($(CONFIG_DEFAULT_COMPRESSION_NONE),y) +DEFAULT_COMPRESSION_SUFFIX := +endif +export DEFAULT_COMPRESSION_SUFFIX + # Build barebox # --------------------------------------------------------------------------- # barebox is built from the objects selected by $(barebox-init) and @@ -1005,7 +1023,7 @@ clean: archclean $(clean-dirs) @find . $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ - -o -name '*.symtypes' \) \ + -o -name '*.symtypes' -o -name '*.bbenv.*' -o -name "*.bbenv" \) \ -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config |