summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rwxr-xr-xsrc/tools/debug/hw-debug-framework.py (renamed from src/tools/debug/sbe-debug.py)2
-rwxr-xr-xsrc/tools/debug/simics-debug-framework.py (renamed from src/tools/debug/simics/simics-debug-framework.py)2
-rwxr-xr-xsrc/tools/debug/simics/sbe_standalone.simics2
-rw-r--r--src/tools/image/Makefile24
-rwxr-xr-xsrc/tools/scripts/ppeSetFixed.pl3
-rw-r--r--src/tools/trace/Makefile (renamed from src/tools/ppetracepp/Makefile)2
-rw-r--r--src/tools/trace/cmvc/makefile (renamed from src/tools/ppetracepp/cmvc/makefile)2
-rwxr-xr-xsrc/tools/trace/jhash.h (renamed from src/tools/ppetracepp/jhash.h)2
-rwxr-xr-xsrc/tools/trace/ppe2fsp.c (renamed from src/tools/ppetracepp/ppe2fsp.c)2
-rw-r--r--src/tools/trace/ppe2fsp.h (renamed from src/tools/ppetracepp/ppe2fsp.h)2
-rw-r--r--src/tools/trace/ppe2fsp_cmd.c (renamed from src/tools/ppetracepp/ppe2fsp_cmd.c)2
-rwxr-xr-xsrc/tools/trace/ppetracepp.C (renamed from src/tools/ppetracepp/ppetracepp.C)2
-rwxr-xr-xsrc/tools/trace/trac_interface.h (renamed from src/tools/ppetracepp/trac_interface.h)2
-rwxr-xr-xsrc/tools/trace/tracehash.pl (renamed from src/tools/ppetracepp/tracehash.pl)2
-rw-r--r--src/tools/utils/modules/gitUtil.pm (renamed from src/tools/utils/perl.modules/gitUtil.pm)2
-rwxr-xr-xsrc/tools/utils/sbeGitTool.pl3
16 files changed, 26 insertions, 30 deletions
diff --git a/src/tools/debug/sbe-debug.py b/src/tools/debug/hw-debug-framework.py
index dbea27d8..7d294e15 100755
--- a/src/tools/debug/sbe-debug.py
+++ b/src/tools/debug/hw-debug-framework.py
@@ -2,7 +2,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/debug/sbe-debug.py $
+# $Source: src/tools/debug/hw-debug-framework.py $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/debug/simics/simics-debug-framework.py b/src/tools/debug/simics-debug-framework.py
index 87d3656b..d15212ea 100755
--- a/src/tools/debug/simics/simics-debug-framework.py
+++ b/src/tools/debug/simics-debug-framework.py
@@ -1,7 +1,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/debug/simics/simics-debug-framework.py $
+# $Source: src/tools/debug/simics-debug-framework.py $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/debug/simics/sbe_standalone.simics b/src/tools/debug/simics/sbe_standalone.simics
deleted file mode 100755
index 8fd3bdb0..00000000
--- a/src/tools/debug/simics/sbe_standalone.simics
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "SBE standalone Tools"
-
diff --git a/src/tools/image/Makefile b/src/tools/image/Makefile
index fab89e66..58650875 100644
--- a/src/tools/image/Makefile
+++ b/src/tools/image/Makefile
@@ -6,6 +6,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2015,2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,28 +60,23 @@ else
CXX = g++
endif
-UTILITIES-SOURCES = sbe_default_tool.c
-UTILITIES = sbe_default_tool
-
-# Utility targets
-UTILITIES-OBJc = $(patsubst %.c,$(BASE_OBJDIR)/%.o,$(UTILITIES-SOURCES))
-UTILITIES-OBJECTS += $(patsubst %.C,$(BASE_OBJDIR)/%.o,$(UTILITIES-OBJc))
-UTILITIES-DEPENDENCIES = $(patsubst %.o,%.d,$(UTILITIES-OBJECTS))
-UTILITIES-EXECUTABLES = $(patsubst %,$(BASE_OBJDIR)/%,$(UTILITIES))
-
.PHONY : all utilities clean
-all: utilities
+all:objdir utilities
+
+objdir:
+ mkdir -p $(BASE_OBJDIR)/tools/image
-utilities: $(UTILITIES-EXECUTABLES)
+utilities: $(IMG_DIR)/sbe_default_tool
CXXFLAGS+=-DFAPI2_NO_FFDC
-$(BASE_OBJDIR)/%.o: %.c
+$(BASE_OBJDIR)/tools/image/%.o: %.c
$(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -c -o $@ $<
-$(BASE_OBJDIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/sbe_default_tool.o
+$(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o
$(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^
clean:
- rm -f $(BASE_OBJDIR)/sbe_default_tool*
+ rm -f $(BASE_OBJDIR)/tools/image/sbe_default_tool*
+ rm -f $(IMG_DIR)/sbe_default_tool*
diff --git a/src/tools/scripts/ppeSetFixed.pl b/src/tools/scripts/ppeSetFixed.pl
index ab92ec42..52880258 100755
--- a/src/tools/scripts/ppeSetFixed.pl
+++ b/src/tools/scripts/ppeSetFixed.pl
@@ -7,6 +7,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2015,2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +29,7 @@
use strict;
my $attrpath = "../../importtemp/xml";
-my $sbedefaultpath = "../../script/image";
+my $sbedefaultpath = "../../../images";
#------------------------------------------------------------------------------
# Print Command Line Help
diff --git a/src/tools/ppetracepp/Makefile b/src/tools/trace/Makefile
index eec6da6a..547cff57 100644
--- a/src/tools/ppetracepp/Makefile
+++ b/src/tools/trace/Makefile
@@ -1,7 +1,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/ppetracepp/Makefile $
+# $Source: src/tools/trace/Makefile $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/ppetracepp/cmvc/makefile b/src/tools/trace/cmvc/makefile
index cf2ad437..3c96ca18 100644
--- a/src/tools/ppetracepp/cmvc/makefile
+++ b/src/tools/trace/cmvc/makefile
@@ -1,7 +1,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/ppetracepp/cmvc/makefile $
+# $Source: src/tools/trace/cmvc/makefile $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/ppetracepp/jhash.h b/src/tools/trace/jhash.h
index 0dcc3bf3..5bfe5fb3 100755
--- a/src/tools/ppetracepp/jhash.h
+++ b/src/tools/trace/jhash.h
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/jhash.h $ */
+/* $Source: src/tools/trace/jhash.h $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/ppe2fsp.c b/src/tools/trace/ppe2fsp.c
index d681b147..c1ddc610 100755
--- a/src/tools/ppetracepp/ppe2fsp.c
+++ b/src/tools/trace/ppe2fsp.c
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/ppe2fsp.c $ */
+/* $Source: src/tools/trace/ppe2fsp.c $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/ppe2fsp.h b/src/tools/trace/ppe2fsp.h
index 2abb146c..56f0a0bd 100644
--- a/src/tools/ppetracepp/ppe2fsp.h
+++ b/src/tools/trace/ppe2fsp.h
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/ppe2fsp.h $ */
+/* $Source: src/tools/trace/ppe2fsp.h $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/ppe2fsp_cmd.c b/src/tools/trace/ppe2fsp_cmd.c
index c36d735c..bab51ab5 100644
--- a/src/tools/ppetracepp/ppe2fsp_cmd.c
+++ b/src/tools/trace/ppe2fsp_cmd.c
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/ppe2fsp_cmd.c $ */
+/* $Source: src/tools/trace/ppe2fsp_cmd.c $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/ppetracepp.C b/src/tools/trace/ppetracepp.C
index 2829e4dd..9d795371 100755
--- a/src/tools/ppetracepp/ppetracepp.C
+++ b/src/tools/trace/ppetracepp.C
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/ppetracepp.C $ */
+/* $Source: src/tools/trace/ppetracepp.C $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/trac_interface.h b/src/tools/trace/trac_interface.h
index 2ff9dff0..ce9355ae 100755
--- a/src/tools/ppetracepp/trac_interface.h
+++ b/src/tools/trace/trac_interface.h
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/tools/ppetracepp/trac_interface.h $ */
+/* $Source: src/tools/trace/trac_interface.h $ */
/* */
/* OpenPOWER sbe Project */
/* */
diff --git a/src/tools/ppetracepp/tracehash.pl b/src/tools/trace/tracehash.pl
index 8855adee..a278741a 100755
--- a/src/tools/ppetracepp/tracehash.pl
+++ b/src/tools/trace/tracehash.pl
@@ -2,7 +2,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/ppetracepp/tracehash.pl $
+# $Source: src/tools/trace/tracehash.pl $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/utils/perl.modules/gitUtil.pm b/src/tools/utils/modules/gitUtil.pm
index bbfd7092..b94f711c 100644
--- a/src/tools/utils/perl.modules/gitUtil.pm
+++ b/src/tools/utils/modules/gitUtil.pm
@@ -2,7 +2,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: src/tools/utils/perl.modules/gitUtil.pm $
+# $Source: src/tools/utils/modules/gitUtil.pm $
#
# OpenPOWER sbe Project
#
diff --git a/src/tools/utils/sbeGitTool.pl b/src/tools/utils/sbeGitTool.pl
index 9ffd4b2b..120a906e 100755
--- a/src/tools/utils/sbeGitTool.pl
+++ b/src/tools/utils/sbeGitTool.pl
@@ -7,6 +7,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +26,7 @@
use strict;
#use lib "$ENV{'PERLMODULES'}";
-use lib "src/tools/utils/perl.modules";
+use lib "src/tools/utils/modules";
use Getopt::Long qw(:config pass_through);
use Data::Dumper;
use Cwd;
OpenPOWER on IntegriCloud