Author: myles
Date: 2009-09-23 19:48:28 +0200 (Wed, 23 Sep 2009)
New Revision: 4659

Modified:
   trunk/coreboot-v2/Makefile
   trunk/coreboot-v2/src/arch/i386/Makefile.inc
Log:
Separate payload compression from stage compression.

Signed-off-by: Myles Watson <[email protected]>
Acked-by: Peter Stuge <[email protected]>


Modified: trunk/coreboot-v2/Makefile
===================================================================
--- trunk/coreboot-v2/Makefile  2009-09-22 22:08:47 UTC (rev 4658)
+++ trunk/coreboot-v2/Makefile  2009-09-23 17:48:28 UTC (rev 4659)
@@ -236,9 +236,10 @@
 CFLAGS += -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow 
 CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
 
-CBFS_COMPRESS_FLAG:=
+CBFS_COMPRESS_FLAG:=l
+CBFS_PAYLOAD_COMPRESS_FLAG:=
 ifeq ($(CONFIG_COMPRESSED_PAYLOAD_LZMA),y)
-CBFS_COMPRESS_FLAG:=l
+CBFS_PAYLOAD_COMPRESS_FLAG:=l
 endif
 
 coreboot: prepare prepare2 $(obj)/coreboot.rom

Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/arch/i386/Makefile.inc        2009-09-22 22:08:47 UTC 
(rev 4658)
+++ trunk/coreboot-v2/src/arch/i386/Makefile.inc        2009-09-23 17:48:28 UTC 
(rev 4659)
@@ -25,7 +25,7 @@
        @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 


-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to