diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-09-23 17:48:28 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-09-23 17:48:28 +0000 |
| commit | 422d0cb71262d27f0eff33ab324703b4a94374e5 (patch) | |
| tree | d67caa3bd71fd1b72364cb01da07a805d9f74436 | |
| parent | d6ac964c89d27428e6ab36d6cdd489626bbd2900 (diff) | |
| download | coreboot-422d0cb71262d27f0eff33ab324703b4a94374e5.tar.xz | |
Separate payload compression from stage compression.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4659 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.inc | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -236,9 +236,10 @@ CFLAGS +=-Wwrite-strings -Wredundant-decls -Wno-trigraphs 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),y) CBFS_COMPRESS_FLAG:=l +CBFS_PAYLOAD_COMPRESS_FLAG:= +ifeq ($(CONFIG_COMPRESSED_PAYLOAD_LZMA),y) +CBFS_PAYLOAD_COMPRESS_FLAG:=l endif coreboot: prepare prepare2 $(obj)/coreboot.rom diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index 24a1654212..9d83ff2bac 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -25,7 +25,7 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y) @printf " PAYLOAD none (as specified by user)\n" else @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n" - $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_COMPRESS_FLAG) + $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) ifeq ($(CONFIG_VGA_BIOS),y) @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom |