summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/cbfstool/Makefile.inc16
-rw-r--r--util/sconfig/config.g4
-rw-r--r--util/sconfig/parsedesc.g3
-rw-r--r--util/sconfig/yapps2.py7
4 files changed, 14 insertions, 16 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 782ce375b3..18434bdd49 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -22,35 +22,35 @@ $(obj)/util/cbfstool:
mkdir -p $@
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c
- printf " HOSTCC $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp
- printf " HOSTCXX $(subst $(obj)/,,$(@))\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
$(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
- printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n"
+ printf " HOSTCXX $(subst $(shell pwd)/,,$(@)) (link)\n"
$(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
endif
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