[v2] r4696 - trunk/coreboot-v2/util/newconfig

Author: oxygene
Date: 2009-09-30 21:54:15 +0200 (Wed, 30 Sep 2009)
New Revision: 4696

Modified:
   trunk/coreboot-v2/util/newconfig/config.g
Log:
Compress stage if CONFIG_COMPRESS is activated, instead of
relying on payload compression configuration (disabled when
using abuild without payload, for example)

Signed-off-by: Patrick Georgi 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g	2009-09-30 17:14:24 UTC (rev 4695)
+++ trunk/coreboot-v2/util/newconfig/config.g	2009-09-30 19:54:15 UTC (rev 4696)
@@ -2277,7 +2277,9 @@

file.write("ifeq "$(CONFIG_CBFS)" "1"\n\n")
    file.write("CBFS_COMPRESS_FLAG:=\n")
+	file.write("CBFS_STAGE_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 +2305,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")