[v2] r4573 - in trunk/coreboot-v2: . src/arch/i386

Author: oxygene
Date: 2009-08-25 15:53:14 +0200 (Tue, 25 Aug 2009)
New Revision: 4573

Modified:
   trunk/coreboot-v2/Makefile
   trunk/coreboot-v2/src/arch/i386/Makefile.inc
Log:
Properly check for the LZMA compression variable, and fix a print
message for the VGA ROM that would print a useless NULL string.

Signed-off by: Cristi Magherusan 
Acked-by: Patrick Georgi

Modified: trunk/coreboot-v2/Makefile
===================================================================
--- trunk/coreboot-v2/Makefile	2009-08-25 12:25:36 UTC (rev 4572)
+++ trunk/coreboot-v2/Makefile	2009-08-25 13:53:14 UTC (rev 4573)
@@ -232,7 +232,7 @@
 CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer

CBFS_COMPRESS_FLAG:=
-ifeq "$(CONFIG_COMPRESSED_PAYLOAD_LZMA)" "1"
+ifeq ($(CONFIG_COMPRESSED_PAYLOAD_LZMA),y)
 CBFS_COMPRESS_FLAG:=l
 endif

Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/arch/i386/Makefile.inc	2009-08-25 12:25:36 UTC (rev 4572)
+++ trunk/coreboot-v2/src/arch/i386/Makefile.inc	2009-08-25 13:53:14 UTC (rev 4573)
@@ -27,7 +27,7 @@
    $(Q) printf "    PAYLOAD    $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
    $(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE)  fallback/payload $(CBFS_COMPRESS_FLAG)
 ifeq ($(CONFIG_VGA_BIOS),y)
-	$(Q) printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID) $(COMPRESSFLAG)\n"
+	$(Q) printf "    VGABIOS    $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
    $(Q) $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom 
 endif
    $(Q) printf "    CBFSPRINT  ./build/coreboot.rom\n\n"