diff options
author | Uwe Hermann <uwe@hermann-uwe.de> | 2009-10-27 23:14:54 +0000 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2009-10-27 23:14:54 +0000 |
commit | 7782319c21b0011aac316a7da945dd0e6efa5933 (patch) | |
tree | cd4103ba9c623543eb25e79f18233d7f8c80d41b /util/sconfig | |
parent | 312673ca729f2b3557a572a03ff6915460329286 (diff) |
Prefix all build output file names of files which end up in the build
directory with "build/" for consistency (trivial, sort of).
Also, drop printing of "config.g" input file, we usually only print
generated/output files in the build output.
Finally, rename non-existing COMPRESSFLAG variable to
CBFS_PAYLOAD_COMPRESS_FLAG in a printf line. The build output now says
PAYLOAD payload.elf l
for payloads (the "l" specifies LZMA compression).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4875 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/sconfig')
-rw-r--r-- | util/sconfig/config.g | 4 | ||||
-rw-r--r-- | util/sconfig/parsedesc.g | 3 | ||||
-rw-r--r-- | util/sconfig/yapps2.py | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/util/sconfig/config.g b/util/sconfig/config.g index fdb1f05fe9..d8bc855021 100644 --- a/util/sconfig/config.g +++ b/util/sconfig/config.g @@ -886,7 +886,7 @@ def dumptree(part, lvl): def writecode(image): filename = os.path.join(img_dir, "static.c") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("#include <device/device.h>\n") file.write("#include <device/pci.h>\n") @@ -920,7 +920,7 @@ def gencode(part, file, pass_num): def writegraph(image): filename = os.path.join(img_dir, "static.dot") - print " SCONFIG Creating", os.path.basename(filename) + print " SCONFIG ", join(filename.split('/')[-5:], '/') file = safe_open(filename, 'w+') file.write("digraph devicetree {\n") file.write(" rankdir=LR\n") diff --git a/util/sconfig/parsedesc.g b/util/sconfig/parsedesc.g index 4c759eb265..1347c87438 100644 --- a/util/sconfig/parsedesc.g +++ b/util/sconfig/parsedesc.g @@ -126,8 +126,7 @@ def generate(inputfilename, outputfilename='', dump=0, **flags): if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc diff --git a/util/sconfig/yapps2.py b/util/sconfig/yapps2.py index f53f16897b..189db9d81b 100644 --- a/util/sconfig/yapps2.py +++ b/util/sconfig/yapps2.py @@ -709,10 +709,9 @@ def generate(inputfilename, outputfilename='', dump=0, **flags): if not outputfilename: if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - - print ' SCONFIG Input Grammar:', os.path.basename(inputfilename) - print ' SCONFIG Output File:', os.path.basename(outputfilename) - + + print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') + DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc |