From patchwork Wed Sep 30 19:41:52 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Compress coreboot_ram also if no payload is compressed
Date: Wed, 30 Sep 2009 19:41:52 -0000
From: Patrick Georgi <patrick@georgi-clan.de>
X-Patchwork-Id: 312
Message-Id: <1254339712.9254.13.camel@tetris>
To: coreboot@coreboot.org

Hi,

attached patch makes coreboot_ram compression depending on
CONFIG_COMPRESS again, instead of looking at the compression
configuration for the payload

Build-tested (some coreboot_ram files were too large without compression
for a full build, and now fit again)

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>


Index: util/newconfig/config.g
===================================================================
--- util/newconfig/config.g	(Revision 4695)
+++ util/newconfig/config.g	(Arbeitskopie)
@@ -2278,6 +2278,7 @@
 	file.write("ifeq \"$(CONFIG_CBFS)\" \"1\"\n\n")
 	file.write("CBFS_COMPRESS_FLAG:=\n")
 	file.write("ifeq \"$(CONFIG_COMPRESSED_PAYLOAD_LZMA)\" \"1\"\nCBFS_COMPRESS_FLAG:=l\nendif\n\n")
+	file.write("ifeq \"$(CONFIG_COMPRESS)\" \"1\"\nCBFS_STAGE_COMPRESS_FLAG:=l\nendif\n\n")
 
 	for i in buildroms:
 		file.write("%s: cbfstool" %(i.name))
@@ -2303,7 +2304,7 @@
 			if (j != "failover") and (rommapping[j] != "/dev/null"):
 				file.write("\t./cbfs/cbfstool %s add-payload %s %s/payload $(CBFS_COMPRESS_FLAG)\n" % (i.name, rommapping[j], j,))
 			if (j != "failover"):
-				file.write("\t./cbfs/cbfstool %s add-stage %s/coreboot_ram %s/coreboot_ram $(CBFS_COMPRESS_FLAG)\n" % (i.name, j, j,))
+				file.write("\t./cbfs/cbfstool %s add-stage %s/coreboot_ram %s/coreboot_ram $(CBFS_STAGE_COMPRESS_FLAG)\n" % (i.name, j, j,))
 			file.write("\tif [ -f %s/coreboot_apc ]; then ./cbfs/cbfstool %s add-stage %s/coreboot_apc %s/coreboot_apc $(CBFS_COMPRESS_FLAG); fi\n" % (j, i.name, j, j,))
 		file.write("\t./cbfs/cbfstool %s print\n" % i.name)
 		file.write("\n")