[coreboot] r778 - in coreboot-v3: arch/x86 lib

[svn at coreboot.org]

Author: hailfinger
Date: 2008-08-17 16:21:50 +0200 (Sun, 17 Aug 2008)
New Revision: 778

Modified:
   coreboot-v3/arch/x86/Makefile
   coreboot-v3/lib/Makefile
Log:
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 <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Stefan Reinauer <stepan at coresystems.de>


Modified: coreboot-v3/arch/x86/Makefile
===================================================================
--- coreboot-v3/arch/x86/Makefile	2008-08-16 13:27:05 UTC (rev 777)
+++ coreboot-v3/arch/x86/Makefile	2008-08-17 14:21:50 UTC (rev 778)
@@ -39,14 +39,6 @@
 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

Modified: coreboot-v3/lib/Makefile
===================================================================
--- coreboot-v3/lib/Makefile	2008-08-16 13:27:05 UTC (rev 777)
+++ coreboot-v3/lib/Makefile	2008-08-17 14:21:50 UTC (rev 778)
@@ -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
 
 #