SBE code restructure: Set up tools directory

Change-Id: I2ad810c3310a7b2ae0a1e1a57b3bd04ef7e9f256
RTC:159709
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28836
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

26 files changed, 171 insertions, 81 deletions

diff --git a/env.bash b/env.bash
index 5c9778b5..6662a005 100755
--- a/env.bash
+++ b/env.bash
@@ -30,7 +30,7 @@ if [ -e ./customrc ]; then
 fi
 
 export PATH=${PATH}:${SBEROOT}/import/chips/p9/xip/bin/
-export PATH=${PATH}:${SBEROOT}/tools/ppetracepp/
+export PATH=${PATH}:${SBEROOT}/sbe/tools/ppetracepp/
 
 if [ -n "${SANDBOXROOT}" ]; then
     if [ -n "${SANDBOXNAME}" ]; then
diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index 4de46a23..24165b25 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -114,10 +114,10 @@ SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).dis
 SIMICS_PPE_TAR_FILES += $(OBJDIR)/sbe.syms
 SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.xml
 SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.py
-SIMICS_PPE_TAR_FILES += $(OBJDIR)/../../tools/ppetracepp/fsp-trace
+SIMICS_PPE_TAR_FILES += $(PPETRACEPP_DIR)/fsp-trace
 SIMICS_PPE_TAR_FILES += $(OBJDIR)/sbeStringFile
 SIMICS_PPE_TAR_FILES += $(OBJDIR)/ppe2fsp
-SIMICS_BB_TAR_FILES += $(OBJDIR)/../build/simics/*
+SIMICS_BB_TAR_FILES += $(SIMICSTOOLS_SRCDIR)/*
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/cmvc/makefile
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.h
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.c
@@ -262,7 +262,8 @@ $(SUBDIRS):
 
 #Build the SBE XIP Tools
 $(SBE_TOOLS): $(P9_XIP_TOOL)
-	$(MAKE) -C $(TOOLS_IMAGE_DIR) -f Makefile
+	$(info #######$(P9_XIP_TOOL)###########)
+	$(MAKE) -I $(IMAGE_SRCDIR) -C $(TOOLS_IMAGE_DIR) -f Makefile
 
 # Build the P9-XIP Tool
 $(P9_XIP_TOOL):
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk
index de1be314..47ff6013 100644
--- a/sbe/image/img_defs.mk
+++ b/sbe/image/img_defs.mk
@@ -92,7 +92,15 @@ export IMPORT_SRCDIR = $(SBE_ROOT_DIR)/import
 endif
 
 ifndef TOOLS_SRCDIR
-export TOOLS_SRCDIR = $(SBE_ROOT_DIR)/tools
+export TOOLS_SRCDIR = $(SBE_SRC_DIR)/tools
+endif
+
+ifndef DEBUGTOOLS_SRCDIR
+export DEBUGTOOLS_SRCDIR = $(TOOLS_SRCDIR)/debug
+endif
+
+ifndef SIMICSTOOLS_SRCDIR
+export SIMICSTOOLS_SRCDIR = $(DEBUGTOOLS_SRCDIR)/simics
 endif
 
 ifndef UTILS_SRCDIR
@@ -151,10 +159,6 @@ ifndef IMG_INCLUDES
 export IMG_INCLUDES = -I$(IMAGEPROCS_SRCDIR) -I$(P9_XIP_SRCDIR) -I$(IMAGE_SRCDIR) -I$(CACHE_SRCDIR) -I$(UTILS_SRCDIR) -I$(CORE_SRCDIR) -I$(PERV_SRCDIR) -I$(NEST_SRCDIR) -I$(PM_SRCDIR) -I$(INITFILES_SRCDIR)
 endif
 
-ifndef BASE_OBJDIR
-export BASE_OBJDIR = $(SBE_SRC_DIR)/obj
-endif
-
 ifndef BOOT_OBJDIR
 export BOOT_OBJDIR = $(BASE_OBJDIR)/boot
 endif
@@ -187,7 +191,7 @@ export IMPORT_COMMON_DIR = $(IMPORT_SRCDIR)/chips/p9/common
 endif
 
 ifndef PPETRACEPP_DIR
-export PPETRACEPP_DIR = $(SBE_ROOT_DIR)/tools/ppetracepp
+export PPETRACEPP_DIR = $(TOOLS_SRCDIR)/ppetracepp
 endif
 
 ifndef PPETRACEPP_BIN_DIR
@@ -345,7 +349,7 @@ INCLUDES += -I$(PK_SRCDIR)/ppe42
 INCLUDES += -I$(SBE_FW_DIR)
 INCLUDES += -I$(BOOT_SRCDIR)
 INCLUDES += -I$(PK_SRCDIR)/trace
-INCLUDES += -I$(SBE_ROOT_DIR)/tools/ppetracepp
+INCLUDES += -I$(PPETRACEPP_DIR)
 INCLUDES += -I$(IMPORT_COMMON_DIR)/include
 INCLUDES += -I$(IMPORT_UTILS_DIR)/imageProcs
 INCLUDES += -I$(IMPORT_UTILS_DIR)/
diff --git a/sbe/build/simics/makefile b/sbe/tools/debug/simics/makefile
index 003fa070..68e435db 100755
--- a/sbe/build/simics/makefile
+++ b/sbe/tools/debug/simics/makefile
@@ -1,3 +1,26 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/tools/debug/simics/makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
 #

 # FSP Destination: obj/ppc/sbei/sbfw/simics/makefile

 #

diff --git a/sbe/build/simics/sbe_standalone.simics b/sbe/tools/debug/simics/sbe_standalone.simics
index 8fd3bdb0..8fd3bdb0 100755
--- a/sbe/build/simics/sbe_standalone.simics
+++ b/sbe/tools/debug/simics/sbe_standalone.simics
diff --git a/sbe/build/simics/sbe_startup.simics b/sbe/tools/debug/simics/sbe_startup.simics
index 5d466a20..5d466a20 100755
--- a/sbe/build/simics/sbe_startup.simics
+++ b/sbe/tools/debug/simics/sbe_startup.simics
diff --git a/sbe/build/simics/simics-debug-framework.py b/sbe/tools/debug/simics/simics-debug-framework.py
index f377e07d..cefc84ab 100755
--- a/sbe/build/simics/simics-debug-framework.py
+++ b/sbe/tools/debug/simics/simics-debug-framework.py
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/simics/simics-debug-framework.py $
+# $Source: sbe/tools/debug/simics/simics-debug-framework.py $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/image/Makefile b/sbe/tools/image/Makefile
index b6164213..f93068a2 100644
--- a/tools/image/Makefile
+++ b/sbe/tools/image/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/image/Makefile $
+# $Source: sbe/tools/image/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,29 +36,7 @@
 #
 
 ############################################################################
-
-
-ifeq ($(CTEPATH),)
-$(warning CTEPATH not defined; defaulting to awd)
-CTEPATH = /afs/awd/projects/cte
-endif
-
-#  Locations of required headers.
-INCLUDES += -I. -I../../ -I../../utils
-INCLUDES += -I ../../sbe/image/
-INCLUDES += -I ../../sbe/sbefw/
-INCLUDES += -I ../../sbe/hwpf/include/plat
-INCLUDES += -I ../../sbe/hwpf/include
-INCLUDES += -I ../../import/chips/p9/procedures/ppe/pk/ppe42/
-INCLUDES += -I ../../import/chips/p9/procedures/ppe/pk/kernel/
-INCLUDES += -I ../../import/chips/p9/procedures/ppe/pk/std/
-INCLUDES += -I ../../import/chips/p9/procedures/ppe/pk/trace/
-INCLUDES += -I ../../tools/ppetracepp/
-INCLUDES += -I ../../import/hwpf/fapi2/include/
-INCLUDES += -I ../../import/chips/p9/xip/
-INCLUDES += -I ../../import/tools/imageProcs/
-INCLUDES += -I ../../import/chips/p9/utils/
-INCLUDES += -I ../../import/chips/p9/utils/imageProcs
+include img_defs.mk
 
 # Under Linux the scheme is to use a common compiler to create procedures.
 # However, the common compiler can be VERY slow, so if the system compiler is
diff --git a/tools/image/sbe_default_tool.c b/sbe/tools/image/sbe_default_tool.c
index b61efeb5..9d8daee8 100644
--- a/tools/image/sbe_default_tool.c
+++ b/sbe/tools/image/sbe_default_tool.c
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: tools/image/sbe_default_tool.c $                              */
+/* $Source: sbe/tools/image/sbe_default_tool.c $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/tools/ppetracepp/Makefile b/sbe/tools/ppetracepp/Makefile
index 561297be..77b8ae8f 100644
--- a/tools/ppetracepp/Makefile
+++ b/sbe/tools/ppetracepp/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/ppetracepp/Makefile $
+# $Source: sbe/tools/ppetracepp/Makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +30,7 @@ ppetracepp: ppetracepp.C
 #	g++ -O3 -w -x c++ -fPIC -g -I./ ppetracepp.C -o ppetracepp
 
 ppe2fsp: ppe2fsp.c ppe2fsp_cmd.c
-	gcc -m32 -w -g -I./ -I../../import/chips/p9/procedures/ppe/pk/trace ppe2fsp.c ppe2fsp_cmd.c -o $(PPETRACEPP_BIN_DIR)/ppe2fsp
+	gcc -m32 -w -g -I./ -I$(PK_SRCDIR)/trace ppe2fsp.c ppe2fsp_cmd.c -o $(PPETRACEPP_BIN_DIR)/ppe2fsp
 
 clean:
 	rm $(PPETRACEPP_BIN_DIR)/ppetracepp $(PPETRACEPP_BIN_DIR)/ppe2fsp
diff --git a/tools/ppetracepp/cmvc/makefile b/sbe/tools/ppetracepp/cmvc/makefile
index f5dab45f..19c74f22 100644
--- a/tools/ppetracepp/cmvc/makefile
+++ b/sbe/tools/ppetracepp/cmvc/makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/ppetracepp/cmvc/makefile $
+# $Source: sbe/tools/ppetracepp/cmvc/makefile $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/ppetracepp/jhash.h b/sbe/tools/ppetracepp/jhash.h
index 128ca9a7..087dfb68 100755
--- a/tools/ppetracepp/jhash.h
+++ b/sbe/tools/ppetracepp/jhash.h
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: sbe/tools/ppetracepp/jhash.h $                                */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #ifndef _LINUX_JHASH_H
 #define _LINUX_JHASH_H
 
diff --git a/tools/ppetracepp/ppe2fsp.c b/sbe/tools/ppetracepp/ppe2fsp.c
index 62d08cfe..469ceced 100755
--- a/tools/ppetracepp/ppe2fsp.c
+++ b/sbe/tools/ppetracepp/ppe2fsp.c
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: tools/ppetracepp/ppe2fsp.c $                                  */
+/* $Source: sbe/tools/ppetracepp/ppe2fsp.c $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/tools/ppetracepp/ppe2fsp.h b/sbe/tools/ppetracepp/ppe2fsp.h
index 092b4a64..6f559572 100644
--- a/tools/ppetracepp/ppe2fsp.h
+++ b/sbe/tools/ppetracepp/ppe2fsp.h
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: tools/ppetracepp/ppe2fsp.h $                                  */
+/* $Source: sbe/tools/ppetracepp/ppe2fsp.h $                              */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/tools/ppetracepp/ppe2fsp_cmd.c b/sbe/tools/ppetracepp/ppe2fsp_cmd.c
index c99734d8..575eaa5f 100644
--- a/tools/ppetracepp/ppe2fsp_cmd.c
+++ b/sbe/tools/ppetracepp/ppe2fsp_cmd.c
@@ -1,3 +1,26 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: sbe/tools/ppetracepp/ppe2fsp_cmd.c $                          */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #include <stdio.h>
 #include "ppe2fsp.h"
 #include "pk_trace.h"
diff --git a/tools/ppetracepp/ppetracepp.C b/sbe/tools/ppetracepp/ppetracepp.C
index 5f86a60b..d0bf5c09 100755
--- a/tools/ppetracepp/ppetracepp.C
+++ b/sbe/tools/ppetracepp/ppetracepp.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: tools/ppetracepp/ppetracepp.C $                               */
+/* $Source: sbe/tools/ppetracepp/ppetracepp.C $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/tools/ppetracepp/trac_interface.h b/sbe/tools/ppetracepp/trac_interface.h
index 74510745..05f447ea 100755
--- a/tools/ppetracepp/trac_interface.h
+++ b/sbe/tools/ppetracepp/trac_interface.h
@@ -1,20 +1,26 @@
-// IBM_PROLOG_BEGIN_TAG 
-// This is an automatically generated prolog. 
-//  
-// occ820 src/occc/405/occ/trac/trac_interface.h 1.4 
-//  
-// IBM CONFIDENTIAL 
-//  
-// OBJECT CODE ONLY SOURCE MATERIALS 
-//  
-// COPYRIGHT International Business Machines Corp. 2011,2012 
-// All Rights Reserved 
-//  
-// The source code for this program is not published or otherwise 
-// divested of its trade secrets, irrespective of what has been 
-// deposited with the U.S. Copyright Office. 
-//  
-// IBM_PROLOG_END_TAG 
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: sbe/tools/ppetracepp/trac_interface.h $                       */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 /******************************************************************************
 // @file trac_interface.h
 // @brief Interface codes for TRAC component.
diff --git a/tools/ppetracepp/tracehash.pl b/sbe/tools/ppetracepp/tracehash.pl
index 629578c0..8617559f 100755
--- a/tools/ppetracepp/tracehash.pl
+++ b/sbe/tools/ppetracepp/tracehash.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/ppetracepp/tracehash.pl $
+# $Source: sbe/tools/ppetracepp/tracehash.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/scripts/parseErrorInfo.pl b/sbe/tools/scripts/parseErrorInfo.pl
index 6249dcad..e7c220a7 100755
--- a/tools/scripts/parseErrorInfo.pl
+++ b/sbe/tools/scripts/parseErrorInfo.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/scripts/parseErrorInfo.pl $
+# $Source: sbe/tools/scripts/parseErrorInfo.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/scripts/ppeCreateAttrGetSetMacros.pl b/sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl
index 2f89453b..651354d1 100755
--- a/tools/scripts/ppeCreateAttrGetSetMacros.pl
+++ b/sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/scripts/ppeCreateAttrGetSetMacros.pl $
+# $Source: sbe/tools/scripts/ppeCreateAttrGetSetMacros.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/scripts/ppeCreateIfAttrService.pl b/sbe/tools/scripts/ppeCreateIfAttrService.pl
index 70895597..898aaacd 100755
--- a/tools/scripts/ppeCreateIfAttrService.pl
+++ b/sbe/tools/scripts/ppeCreateIfAttrService.pl
@@ -1,4 +1,27 @@
 #!/usr/bin/perl
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/tools/scripts/ppeCreateIfAttrService.pl $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
 # Purpose:  This perl script will parse HWP Attribute XML files and
 # initfile attr files and create the fapiGetInitFileAttr() function
 # in a file called fapi2AttributeService.C
diff --git a/tools/scripts/ppeParseAttrGetSetMacros.pl b/sbe/tools/scripts/ppeParseAttrGetSetMacros.pl
index cf573ae7..8466f3c9 100644
--- a/tools/scripts/ppeParseAttrGetSetMacros.pl
+++ b/sbe/tools/scripts/ppeParseAttrGetSetMacros.pl
@@ -1,4 +1,27 @@
 #!/usr/bin/perl
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/tools/scripts/ppeParseAttrGetSetMacros.pl $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
 # Purpose:  This perl script will parse HWP Attribute XML files and
 # initfile attr files and create the fapiGetInitFileAttr() function
 # in a file called fapiAttributeService.C
diff --git a/tools/scripts/ppeParseAttributeInfo.pl b/sbe/tools/scripts/ppeParseAttributeInfo.pl
index a888d42a..7f381f2b 100755
--- a/tools/scripts/ppeParseAttributeInfo.pl
+++ b/sbe/tools/scripts/ppeParseAttributeInfo.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/scripts/ppeParseAttributeInfo.pl $
+# $Source: sbe/tools/scripts/ppeParseAttributeInfo.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/scripts/ppeParseProcSbeFixed.pl b/sbe/tools/scripts/ppeParseProcSbeFixed.pl
index 2d10cd25..ed1cd2ee 100755
--- a/tools/scripts/ppeParseProcSbeFixed.pl
+++ b/sbe/tools/scripts/ppeParseProcSbeFixed.pl
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/scripts/ppeParseProcSbeFixed.pl $
+# $Source: sbe/tools/scripts/ppeParseProcSbeFixed.pl $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/scripts/ppeSetFixed.pl b/sbe/tools/scripts/ppeSetFixed.pl
index aba25973..29db6c23 100755
--- a/tools/scripts/ppeSetFixed.pl
+++ b/sbe/tools/scripts/ppeSetFixed.pl
@@ -2,7 +2,7 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: tools/scripts/ppeSetFixed.pl $
+# $Source: sbe/tools/scripts/ppeSetFixed.pl $
 #
 # OpenPOWER sbe Project
 #
diff --git a/tools/scripts/src/fapi2PlatAttributeService.H b/sbe/tools/scripts/src/fapi2PlatAttributeService.H
index 739db1f8..0d53a134 100644
--- a/tools/scripts/src/fapi2PlatAttributeService.H
+++ b/sbe/tools/scripts/src/fapi2PlatAttributeService.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: tools/scripts/src/fapi2PlatAttributeService.H $               */
+/* $Source: sbe/tools/scripts/src/fapi2PlatAttributeService.H $           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */