From 3392900db9587f9cb0c9823c0e952183a7073cdc Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sun, 17 Aug 2008 14:21:50 +0000 Subject: [PATCH] The decompressors linked into stage0 end up in the variable DECOMPRESSORS in arch/x86/Makefile. They absolutely do no belong there because they're not arch specific. lib/Makefile has a variable COMPRESSORS with identical content, but that variable is completely unused. Move DECOMPRESSORS to lib/Makefile and kill the unused one. Build and boot tested on qemu. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Reinauer git-svn-id: svn://coreboot.org/repository/coreboot-v3@778 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- arch/x86/Makefile | 8 -------- lib/Makefile | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 295ceb042e..9254fd71fa 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -39,14 +39,6 @@ ROM_SIZE := $(shell expr $(CONFIG_COREBOOT_ROMSIZE_KB) \* 1024) LARFILES_NOCOMPRESS := coreboot.initram:normal/initram option_table:normal/option_table LARFILES_COMPRESSIBLE := coreboot.stage2:normal/stage2 -DECOMPRESSORS := -ifeq ($(CONFIG_COMPRESSION_LZMA),y) -DECOMPRESSORS += lzma.o -endif -ifeq ($(CONFIG_COMPRESSION_NRV2B),y) -DECOMPRESSORS += nrv2b.o -endif - COMPRESSFLAG := ifeq ($(CONFIG_DEFAULT_COMPRESSION_LZMA),y) COMPRESSFLAG := -C lzma diff --git a/lib/Makefile b/lib/Makefile index dba929a0f6..afbff92ad8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -19,12 +19,12 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -COMPRESSORS := +DECOMPRESSORS := ifeq ($(CONFIG_COMPRESSION_LZMA),y) -COMPRESSORS += lzma.o +DECOMPRESSORS += lzma.c endif ifeq ($(CONFIG_COMPRESSION_NRV2B),y) -COMPRESSORS += nrv2b.o +DECOMPRESSORS += nrv2b.c endif #