diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-09-30 19:54:15 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-09-30 19:54:15 +0000 |
| commit | aeab4fcca0ddea315ed3222eecd8ad74269c3924 (patch) | |
| tree | a65d9d7691273fa1f1ad80c0f63792d2ace1f13d | |
| parent | e23e37202cbad9dce81986efcd68e3a199db6605 (diff) | |
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 <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4696 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | util/newconfig/config.g | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 071a54536d..2f5dddfc2d 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -2277,7 +2277,9 @@ def writemakefile(path): 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 @@ def writemakefile(path): 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") |