From ca5d9fb74ab3fc74c5ea74cfb320eb1f33ae8d8d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 25 Aug 2009 13:53:14 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4573 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- Makefile | 2 +- src/arch/i386/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ef20d1a289..e937e7c39b 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ CFLAGS += -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow 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 diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index c505740d85..541c5bb97d 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -27,7 +27,7 @@ else $(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"