Compression fix - Patchwork

Submitter	Myles Watson
Date	2009-09-23 17:41:42
Message ID	<2831fecf0909231041h4bbb3fdh2938ea492fe4784e@mail.gmail.com>
Download	mbox \| patch
Permalink	/patch/284/
State	Accepted
Headers	show Return-path: <coreboot-bounces@coreboot.org> Envelope-to: patchwork@coreboot.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=xqupcbJz8agIkinkSn65S3G+QGD0/8Czj6QYkIBlhFCkFsAuZ1+bavEAxosqUP/PaC yFZ6nxEIfc+ld4Mf/MpPps3z9wj99zvjNtGJXMkvUH4mB2h8Kq6Yqk63L7jk7CncZrjb WA3L8YEliT3L2zIxeZs5LK2//bvhYn8xPMB90= MIME-Version: 1.0 Date: Wed, 23 Sep 2009 11:41:42 -0600 Message-ID: <2831fecf0909231041h4bbb3fdh2938ea492fe4784e@mail.gmail.com> From: Myles Watson <mylesgw@gmail.com> To: coreboot <coreboot@coreboot.org> Content-Type: multipart/mixed; boundary=00151774046e56f86f0474423a17 Subject: [coreboot] [PATCH] Compression fix Precedence: list Sender: coreboot-bounces@coreboot.org Errors-To: coreboot-bounces@coreboot.org

Comments

Myles Watson - 2009-09-23 17:41:42

Separate payload compression from stage compression.  I figured out why
sometimes my coreboot_ram was 40K and sometimes it was 250K.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

Peter Stuge - 2009-09-23 17:44:50

Myles Watson wrote:
> Separate payload compression from stage compression.  I figured out why
> sometimes my coreboot_ram was 40K and sometimes it was 250K.
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

Acked-by: Peter Stuge <peter@stuge.se>

Myles Watson - 2009-09-23 17:49:38

On Wed, Sep 23, 2009 at 11:44 AM, Peter Stuge <peter@stuge.se> wrote:

> Myles Watson wrote:
> > Separate payload compression from stage compression.  I figured out why
> > sometimes my coreboot_ram was 40K and sometimes it was 250K.
> >
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Acked-by: Peter Stuge <peter@stuge.se><http://www.coreboot.org/mailman/listinfo/coreboot>

Rev 4659.

Thanks,
Myles

Patch

Index: svn/src/arch/i386/Makefile.inc
===================================================================
--- svn.orig/src/arch/i386/Makefile.inc
+++ svn/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 
Index: svn/Makefile
===================================================================
--- svn.orig/Makefile
+++ svn/Makefile
@@ -236,9 +236,10 @@  CFLAGS +=-Wwrite-strings -Wredundant-dec
 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

Patchwork Compression fix

Comments

Patch