24 files changed, 124 insertions, 111 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 66856533..c6b1cc40 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -22,7 +22,20 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
+############################################################################
+# Image settings
+# pass argument img=seeprom/pibmem
+# By default seeprom image is built
+ifndef img
+export img = seeprom
+endif
 
+# pass argument project=power/zthemis
+# By default power image is built
+ifndef project
+export project = power
+endif
+###########################################################################
 
 #Pull in the definitions that affect all makefiles for this image
 include img_defs.mk
@@ -152,7 +165,7 @@ LINK_SCRIPT_SBE = $(addprefix $(OBJDIR)/build/linkerscripts, linkscriptsbe)
 # ---- SEEPROM Image  ------
 # This removes all unecessary headers from the ELF executable
 $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis: $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out
-	./parsAndCutElf.py $(IMAGE_SUFFIX)
+	./parsAndCutElf.py $(IMAGE_SUFFIX) $(IMG_DIR)
 	$(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis
 
 #create a linked ELF executable
@@ -240,7 +253,7 @@ report: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin
 
 # Create build Info file
 buildInfo:
-	python buildInfo.py $(OBJDIR)
+	python buildInfo.py $(GENFILES_DIR)
 
 
 #Create an obj directory if needed
@@ -341,7 +354,7 @@ tracehash:
 #clean the kernel directory first, then the application level clean
 clean:
 	rm -fr $(SBE_ROOT_DIR)/obj
-	rm -fr $(IMG_DIR)
+	rm -fr $(IMG_ROOT_DIR)
 
 #Add dependencies to header files
 ifneq ($(MAKECMDGOALS),clean)
diff --git a/src/build/buildInfo.py b/src/build/buildInfo.py
index 9a8e3188..e71d287c 100755
--- a/src/build/buildInfo.py
+++ b/src/build/buildInfo.py
@@ -6,7 +6,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2018
 # [+] Google Inc.
 # [+] International Business Machines Corp.
 #
@@ -31,7 +31,7 @@ import os
 import sys
 
 def buildInfo():
-    buildInfoFileName = sys.argv[1]+"/genfiles/sbe_build_info.H"
+    buildInfoFileName = sys.argv[1]+"/sbe_build_info.H"
     header = \
 "#ifndef SBE_BUILD_INFO_H  \n\
 #define SBE_BUILD_INFO_H  \n\n"
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index 2114ba2a..2da96d25 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -51,17 +51,9 @@
 #                       Defaults to IBM CTE tools path.
 #
 # OBJDIR             : target directory for all generated files
-
-IMAGE_SUFFIX := DD2
-GCC-DEFS += -DDD2
-IMAGE_SEEPROM_NAME := sbe_seeprom_$(IMAGE_SUFFIX)
-IMAGE_SBE_NAME := sbe_pibmem_$(IMAGE_SUFFIX)
-IMAGE_LOADER_NAME := sbe_loader
-IMAGE_OTPROM_NAME := sbe_otprom_$(IMAGE_SUFFIX)
-IMAGE_BASE_PPE_HEADER := base_ppe_header
-
-SBE_SYMBOLS_NAME := sbe_$(IMAGE_SUFFIX).syms
-SBE_STRINGFILE_NAME := sbeStringFile_$(IMAGE_SUFFIX)
+ifeq ($(project),power)
+include power_defs.mk
+endif
 
 ifndef PPE_TYPE
 PPE_TYPE := std
@@ -82,45 +74,45 @@ endif
 ifndef BUILD_DIR
 export BUILD_DIR = $(SBE_SRC_DIR)/build
 endif
-# Required for pk/std/makefile
-ifndef IMAGE_SRCDIR
-export IMAGE_SRCDIR = $(BUILD_DIR)
-endif
 
 ifndef BUILDDATA_SRCDIR
 export BUILDDATA_SRCDIR = $(BUILD_DIR)/utils
 endif
 
 ifndef LINKER_DIR
-export LINKER_DIR = $(BUILD_DIR)/linkerscripts
+export LINKER_DIR = $(BUILD_DIR)/linkerscripts/$(project)
+endif
+
+ifndef IMPORT_HWP_MK_DIR
+export IMPORT_HWP_MK_DIR = $(BUILD_DIR)/import_hwp_mk/$(project)
 endif
 
 ifndef ISTEP2_INFRA_DIR
-export ISTEP2_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep2
+export ISTEP2_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep2
 endif
 
 ifndef ISTEP3_INFRA_DIR
-export ISTEP3_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep3
+export ISTEP3_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep3
 endif
 
 ifndef ISTEP4_INFRA_DIR
-export ISTEP4_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep4
+export ISTEP4_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep4
 endif
 
 ifndef ISTEP5_INFRA_DIR
-export ISTEP5_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep5
+export ISTEP5_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep5
 endif
 
 ifndef ISTEPMPIPL_INFRA_DIR
-export ISTEPMPIPL_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istepmpipl
+export ISTEPMPIPL_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepmpipl
 endif
 
 ifndef ISTEPCOMMON_INFRA_DIR
-export ISTEPCOMMON_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istepcommon
+export ISTEPCOMMON_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istepcommon
 endif
 
 ifndef ARRAYACCESS_INFRA_DIR
-export ARRAYACCESS_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/arrayaccess
+export ARRAYACCESS_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/arrayaccess
 endif
 
 ifndef BOOT_SRCDIR
@@ -231,8 +223,12 @@ ifndef BUILDDATA_OBJDIR
 export BUILDDATA_OBJDIR = $(BASE_OBJDIR)/build/utils
 endif
 
+ifndef IMG_ROOT_DIR
+export IMG_ROOT_DIR = $(SBE_ROOT_DIR)/images
+endif
+
 ifndef IMG_DIR
-export IMG_DIR = $(SBE_ROOT_DIR)/images
+export IMG_DIR = $(IMG_ROOT_DIR)
 endif
 
 ifndef PK_SRCDIR
@@ -410,20 +406,10 @@ GCC-O-LEVEL = -Os
 endif
 endif
 
-FAPI_TRACE_LEVEL_DEF = 2
-
 ifdef FAPI_TRACE_LEVEL_ENV
 FAPI_TRACE_LEVEL_DEF = $(FAPI_TRACE_LEVEL_ENV)
 endif
 
-# Levels of SBE logging
-# 0 - No tracing
-# 1 - Error
-# 2 - Error, info
-# 3 - Error, info, entry/exit
-# 4 - Error, info, entry/exit, debug
-SBE_TRACE_LEVEL_DEF = 2
-
 GCC-DEFS += -DIMAGE_NAME=$(IMAGE_SEEPROM_NAME)
 GCC-DEFS += -DPK_TIMER_SUPPORT=$(PK_TIMER_SUPPORT)
 GCC-DEFS += -DPK_THREAD_SUPPORT=$(PK_THREAD_SUPPORT)
@@ -451,7 +437,6 @@ export LD_LIBRARY_PATH+=:$(CROSS_COMPILER_PATH)/lib
 
 
 INCLUDES += $(IMG_INCLUDES)
-INCLUDES += -I$(BUILD_DIR)/../../include
 INCLUDES += -I$(HWPLIB_SRCDIR)
 INCLUDES += -I$(GENFILES_DIR)
 INCLUDES += -I$(PLAT_FAPI2_DIR)
@@ -521,13 +506,6 @@ GCC-CFLAGS += -mcpu=ppe42
 GCC-CFLAGS += -ffunction-sections
 GCC-CFLAGS += -fdata-sections
 endif
-############################################################################
-# Image settings
-# pass argument img=seeprom/pibmem
-# By default seeprom image is built
-ifndef img
-img = seeprom
-endif
 
 ifeq ($(img), seeprom)
 GCC-DEFS += -DSEEPROM_IMAGE
@@ -535,10 +513,7 @@ endif
 ifeq ($(img), pibmem)
 GCC-DEFS += -DPIBMEM_ONLY_IMAGE
 endif
-
-###########################################################################
-
-
+############################################################################
 CFLAGS =
 PPE-CFLAGS = $(CFLAGS) -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)
 
@@ -617,4 +592,3 @@ $(OBJDIR)/%.d: %.S $(FAPI_RC)
 	$(CC_ASM) -MM $(INCLUDES) $(CPPFLAGS) $(DEFS) $< >> $@.$$$$; \
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
-
diff --git a/src/build/import_hwp_mk/arrayaccess/Makefile b/src/build/import_hwp_mk/power/arrayaccess/Makefile
index d78b6741..743fea11 100644
--- a/src/build/import_hwp_mk/arrayaccess/Makefile
+++ b/src/build/import_hwp_mk/power/arrayaccess/Makefile
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/arrayaccess/Makefile $
+# $Source: src/build/import_hwp_mk/power/arrayaccess/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/arrayaccess/arrayaccessfiles.mk b/src/build/import_hwp_mk/power/arrayaccess/arrayaccessfiles.mk
index 6fa77bcb..a8accf8b 100644
--- a/src/build/import_hwp_mk/arrayaccess/arrayaccessfiles.mk
+++ b/src/build/import_hwp_mk/power/arrayaccess/arrayaccessfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/arrayaccess/arrayaccessfiles.mk $
+# $Source: src/build/import_hwp_mk/power/arrayaccess/arrayaccessfiles.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep2/Makefile b/src/build/import_hwp_mk/power/istep2/Makefile
index 8bfa2196..76d811d7 100644
--- a/src/build/import_hwp_mk/istep2/Makefile
+++ b/src/build/import_hwp_mk/power/istep2/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep2/Makefile $
+# $Source: src/build/import_hwp_mk/power/istep2/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep2/istep2files.mk b/src/build/import_hwp_mk/power/istep2/istep2files.mk
index b1fa9c02..b58dd262 100644
--- a/src/build/import_hwp_mk/istep2/istep2files.mk
+++ b/src/build/import_hwp_mk/power/istep2/istep2files.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep2/istep2files.mk $
+# $Source: src/build/import_hwp_mk/power/istep2/istep2files.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep3/Makefile b/src/build/import_hwp_mk/power/istep3/Makefile
index ef27452f..f1f90eaa 100644
--- a/src/build/import_hwp_mk/istep3/Makefile
+++ b/src/build/import_hwp_mk/power/istep3/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep3/Makefile $
+# $Source: src/build/import_hwp_mk/power/istep3/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep3/istep3files.mk b/src/build/import_hwp_mk/power/istep3/istep3files.mk
index 417bd309..a39c07de 100644
--- a/src/build/import_hwp_mk/istep3/istep3files.mk
+++ b/src/build/import_hwp_mk/power/istep3/istep3files.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep3/istep3files.mk $
+# $Source: src/build/import_hwp_mk/power/istep3/istep3files.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep4/Makefile b/src/build/import_hwp_mk/power/istep4/Makefile
index f9f38dce..80ea200f 100644
--- a/src/build/import_hwp_mk/istep4/Makefile
+++ b/src/build/import_hwp_mk/power/istep4/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep4/Makefile $
+# $Source: src/build/import_hwp_mk/power/istep4/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/power/istep4/istep4files.mk
index fca57ab0..273950db 100644
--- a/src/build/import_hwp_mk/istep4/istep4files.mk
+++ b/src/build/import_hwp_mk/power/istep4/istep4files.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep4/istep4files.mk $
+# $Source: src/build/import_hwp_mk/power/istep4/istep4files.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep5/Makefile b/src/build/import_hwp_mk/power/istep5/Makefile
index 5af46dd0..15b88250 100644
--- a/src/build/import_hwp_mk/istep5/Makefile
+++ b/src/build/import_hwp_mk/power/istep5/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep5/Makefile $
+# $Source: src/build/import_hwp_mk/power/istep5/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istep5/istep5files.mk b/src/build/import_hwp_mk/power/istep5/istep5files.mk
index 3620d728..b83d445f 100644
--- a/src/build/import_hwp_mk/istep5/istep5files.mk
+++ b/src/build/import_hwp_mk/power/istep5/istep5files.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istep5/istep5files.mk $
+# $Source: src/build/import_hwp_mk/power/istep5/istep5files.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istepcommon/Makefile b/src/build/import_hwp_mk/power/istepcommon/Makefile
index 046c88a8..0fc6ecf2 100644
--- a/src/build/import_hwp_mk/istepcommon/Makefile
+++ b/src/build/import_hwp_mk/power/istepcommon/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istepcommon/Makefile $
+# $Source: src/build/import_hwp_mk/power/istepcommon/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk
index c9a61c0c..e6919141 100644
--- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
+++ b/src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk $
+# $Source: src/build/import_hwp_mk/power/istepcommon/istepcommonfiles.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istepmpipl/Makefile b/src/build/import_hwp_mk/power/istepmpipl/Makefile
index df369fe0..e559e3d8 100644
--- a/src/build/import_hwp_mk/istepmpipl/Makefile
+++ b/src/build/import_hwp_mk/power/istepmpipl/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istepmpipl/Makefile $
+# $Source: src/build/import_hwp_mk/power/istepmpipl/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk b/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk
index d4e07107..db1c6c72 100644
--- a/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk
+++ b/src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk $
+# $Source: src/build/import_hwp_mk/power/istepmpipl/istepmpiplfiles.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2016,2018
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/build/linkerscripts/linkloader.cmd b/src/build/linkerscripts/power/linkloader.cmd
index dec33189..264bb74d 100755
--- a/src/build/linkerscripts/linkloader.cmd
+++ b/src/build/linkerscripts/power/linkloader.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/build/linkerscripts/linkloader.cmd $                      */
+/* $Source: src/build/linkerscripts/power/linkloader.cmd $                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/build/linkerscripts/linkotprom.cmd b/src/build/linkerscripts/power/linkotprom.cmd
index d4b832e2..0b154f2a 100644
--- a/src/build/linkerscripts/linkotprom.cmd
+++ b/src/build/linkerscripts/power/linkotprom.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/build/linkerscripts/linkotprom.cmd $                      */
+/* $Source: src/build/linkerscripts/power/linkotprom.cmd $                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/build/linkerscripts/linksbe.cmd b/src/build/linkerscripts/power/linksbe.cmd
index 7a5cc5bf..56df1e53 100644
--- a/src/build/linkerscripts/linksbe.cmd
+++ b/src/build/linkerscripts/power/linksbe.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/build/linkerscripts/linksbe.cmd $                         */
+/* $Source: src/build/linkerscripts/power/linksbe.cmd $                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/power/linkseeprom.cmd
index 03798df0..77224a69 100644
--- a/src/build/linkerscripts/linkseeprom.cmd
+++ b/src/build/linkerscripts/power/linkseeprom.cmd
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/build/linkerscripts/linkseeprom.cmd $                     */
+/* $Source: src/build/linkerscripts/power/linkseeprom.cmd $               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2018                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/build/parsAndCutElf.py b/src/build/parsAndCutElf.py
index 43201cb2..49192014 100755
--- a/src/build/parsAndCutElf.py
+++ b/src/build/parsAndCutElf.py
@@ -6,7 +6,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -33,11 +33,12 @@ import sys
 def parserElf(argv):
     try:
         ddlevel = argv[1]
+        outdir  = argv[2]
     except:
-        print "Missing DD level name"
+        print "Missing argument : arg[0] ddlevel; arg[1] output directory"
         exit(-1)
-    SBE_SEEPROM_OUT = "../../images/sbe_seeprom_"+ddlevel+".out"
-    SBE_SEEPROM_BIN = "../../images/sbe_seeprom_"+ddlevel+".bin"
+    SBE_SEEPROM_OUT = outdir+"/sbe_seeprom_"+ddlevel+".out"
+    SBE_SEEPROM_BIN = outdir+"/sbe_seeprom_"+ddlevel+".bin"
     cmd = "readelf -S "+SBE_SEEPROM_OUT
     firstSection = ".header"
     cmd1 = "nm "+SBE_SEEPROM_OUT+" | grep  _sbe_image_size"
@@ -74,4 +75,3 @@ def parserElf(argv):
        exit(-1)
 
 parserElf(sys.argv)
-
diff --git a/src/build/power_defs.mk b/src/build/power_defs.mk
new file mode 100644
index 00000000..2ab49cda
--- /dev/null
+++ b/src/build/power_defs.mk
@@ -0,0 +1,44 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/power_defs.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2017,2018
+#
+#
+# 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
+# Levels of SBE logging
+# 0 - No tracing
+# 1 - Error
+# 2 - Error, info
+# 3 - Error, info, entry/exit
+# 4 - Error, info, entry/exit, debug
+SBE_TRACE_LEVEL_DEF = 2
+
+FAPI_TRACE_LEVEL_DEF = 2
+
+IMAGE_SUFFIX := DD2
+GCC-DEFS += -DDD2
+IMAGE_SEEPROM_NAME := sbe_seeprom_$(IMAGE_SUFFIX)
+IMAGE_SBE_NAME := sbe_pibmem_$(IMAGE_SUFFIX)
+
+IMAGE_LOADER_NAME := sbe_loader
+IMAGE_OTPROM_NAME := sbe_otprom_$(IMAGE_SUFFIX)
+IMAGE_BASE_PPE_HEADER := base_ppe_header
+
+SBE_SYMBOLS_NAME := sbe_$(IMAGE_SUFFIX).syms
+SBE_STRINGFILE_NAME := sbeStringFile_$(IMAGE_SUFFIX)
diff --git a/src/test/framework/populate-sandbox b/src/test/framework/populate-sandbox
index 05da6b4a..f765d8fc 100755
--- a/src/test/framework/populate-sandbox
+++ b/src/test/framework/populate-sandbox
@@ -6,7 +6,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2016
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -58,4 +58,3 @@ execute_in_sandbox "cd $SBEFW_DIR; mk install_all" \
 
 # Copy test files.
 cp  -r $SBEROOT/src/test/testcases/* $SBETESTDIR/ || exit -1
-