FAPI Plat Cleanup

-- Remove src and include subdirs

Change-Id: I47d2b7d0b3667e7765692fb014932ae23a6325f7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41085
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com>
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>

29 files changed, 53 insertions, 219 deletions

diff --git a/src/build/Makefile b/src/build/Makefile
index 1c974f6f..ee8a3389 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -44,7 +44,7 @@ SBEFWLIB := $(OBJDIR)/sbefw/libsbefw.a
 LLIBS += -lsbefw
 
 # FAPI2 library
-SUBDIRS += $(PLAT_FAPI2_DIR)/src
+SUBDIRS += $(PLAT_FAPI2_DIR)
 LIB_DIRS += -L$(OBJDIR)/fapi2
 FAPI2LIB := $(OBJDIR)/fapi2/libfapi2.a
 LLIBS += -lfapi2
@@ -247,16 +247,16 @@ $(OBJDIR):
 	mkdir -p $(IMPORT_OBJDIR)
 	$(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl $(GENFILES_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
 	$(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(GENFILES_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
-	$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR)/src/plat --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
+	$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR) --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
 
 topfixedheaders:
 	$(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
 
 attrids:
-	$(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
+	$(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR) $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES)
 
 platattr:
-	$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR)/src/plat --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
+	$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(PLAT_FAPI2_DIR) --inc $(GENFILES_DIR) --src $(GENFILES_DIR)
 
 # Build the subdirectories
 $(SUBDIRS):
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index dda6bd36..2b0e6998 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -431,8 +431,8 @@ export LD_LIBRARY_PATH+=:$(CROSS_COMPILER_PATH)/lib
 INCLUDES += $(IMG_INCLUDES)
 INCLUDES += -I$(BUILD_DIR)/../../include
 INCLUDES += -I$(HWPLIB_SRCDIR)
-INCLUDES += -I$(PLAT_FAPI2_DIR)/include/plat
-INCLUDES += -I$(PLAT_FAPI2_DIR)/include
+INCLUDES += -I$(GENFILES_DIR)
+INCLUDES += -I$(PLAT_FAPI2_DIR)
 INCLUDES += -I$(BASE_FAPI2_DIR)/include
 INCLUDES += -I$(PK_SRCDIR)/../include
 INCLUDES += -I$(PK_SRCDIR)/$(PPE_TYPE)
@@ -443,7 +443,6 @@ INCLUDES += -I$(PK_SRCDIR)/ppe
 INCLUDES += -I$(PK_SRCDIR)/ppe42
 INCLUDES += -I$(SBE_FW_DIR)
 INCLUDES += -I$(BOOT_SRCDIR)
-INCLUDES += -I$(GENFILES_DIR)
 INCLUDES += -I$(BUILDDATA_SRCDIR)
 INCLUDES += -I$(PK_SRCDIR)/trace
 INCLUDES += -I$(PPETRACEPP_DIR)
diff --git a/src/hwpf/src/plat/Makefile b/src/hwpf/Makefile
index c121f162..e61d8a18 100644
--- a/src/hwpf/src/plat/Makefile
+++ b/src/hwpf/Makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/hwpf/src/plat/Makefile $
+# $Source: src/hwpf/Makefile $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2015,2017
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,13 +22,20 @@
 #
 # IBM_PROLOG_END_TAG
 # This Makefile is designed to be invoked with the -I argument
+
+export SUB_OBJDIR = /fapi2
+
 include img_defs.mk
-include fapi2sbeplatfiles.mk
+include fapi2sbefiles.mk
+
 
 OBJS := $(addprefix $(OBJDIR)/, $(FAPI2PLATLIB_OBJECTS))
 
-all: $(OBJS)
+libfapi2.a: fapi2 hwpf
+	$(AR) crs $(OBJDIR)/libfapi2.a $(OBJDIR)/*.o
 
+.PHONY: clean fapi2 hwpf
+fapi2: $(OBJS)
 
 $(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
 
diff --git a/src/hwpf/src/plat/fapi2sbeplatfiles.mk b/src/hwpf/fapi2sbefiles.mk
index b931f847..93409440 100644
--- a/src/hwpf/src/plat/fapi2sbeplatfiles.mk
+++ b/src/hwpf/fapi2sbefiles.mk
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/hwpf/src/plat/fapi2sbeplatfiles.mk $
+# $Source: src/hwpf/fapi2sbefiles.mk $
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
+# Contributors Listed Below - COPYRIGHT 2015,2017
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,10 +43,10 @@
 FAPI2PLAT-CPP-SOURCES += plat_hw_access.C
 FAPI2PLAT-CPP-SOURCES += plat_utils.C
 FAPI2PLAT-CPP-SOURCES += target.C
-
+FAPI2PLAT-CPP-SOURCES += ffdc.C
+FAPI2PLAT-CPP-SOURCES += plat_ring_traverse.C
 FAPI2PLAT-C-SOURCES =
 FAPI2PLAT-S-SOURCES =
 
-
 FAPI2PLATLIB_OBJECTS += $(FAPI2PLAT-CPP-SOURCES:.C=.o) $(FAPI2PLAT-C-SOURCES:.c=.o) $(FAPI2PLAT-S-SOURCES:.S=.o)
 
diff --git a/src/hwpf/src/ffdc.C b/src/hwpf/ffdc.C
index e8242f2a..05f14793 100644
--- a/src/hwpf/src/ffdc.C
+++ b/src/hwpf/ffdc.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/ffdc.C $                                         */
+/* $Source: src/hwpf/ffdc.C $                                             */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/hw_access.H b/src/hwpf/hw_access.H
index fdbca56a..9c5da3aa 100644
--- a/src/hwpf/include/plat/hw_access.H
+++ b/src/hwpf/hw_access.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/hw_access.H $                           */
+/* $Source: src/hwpf/hw_access.H $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/hwp_executor.H b/src/hwpf/hwp_executor.H
index c77b163a..f3d2ba0a 100644
--- a/src/hwpf/include/plat/hwp_executor.H
+++ b/src/hwpf/hwp_executor.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/hwp_executor.H $                        */
+/* $Source: src/hwpf/hwp_executor.H $                                     */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/multicast.H b/src/hwpf/multicast.H
index 5bf1c549..8ec0c4a7 100644
--- a/src/hwpf/include/plat/multicast.H
+++ b/src/hwpf/multicast.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/multicast.H $                           */
+/* $Source: src/hwpf/multicast.H $                                        */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/src/plat/plat_attribute_service.H b/src/hwpf/plat_attribute_service.H
index 008132c3..b33065b0 100644
--- a/src/hwpf/src/plat/plat_attribute_service.H
+++ b/src/hwpf/plat_attribute_service.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/plat/plat_attribute_service.H $                  */
+/* $Source: src/hwpf/plat_attribute_service.H $                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_attributes.H b/src/hwpf/plat_attributes.H
index 781cbd56..ed38221d 100644
--- a/src/hwpf/include/plat/plat_attributes.H
+++ b/src/hwpf/plat_attributes.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_attributes.H $                     */
+/* $Source: src/hwpf/plat_attributes.H $                                  */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_error_scope.H b/src/hwpf/plat_error_scope.H
index 153de5e2..8a548c44 100644
--- a/src/hwpf/include/plat/plat_error_scope.H
+++ b/src/hwpf/plat_error_scope.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_error_scope.H $                    */
+/* $Source: src/hwpf/plat_error_scope.H $                                 */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/src/plat/plat_hw_access.C b/src/hwpf/plat_hw_access.C
index 8508eda1..d1112533 100644
--- a/src/hwpf/src/plat/plat_hw_access.C
+++ b/src/hwpf/plat_hw_access.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/plat/plat_hw_access.C $                          */
+/* $Source: src/hwpf/plat_hw_access.C $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_hw_access.H b/src/hwpf/plat_hw_access.H
index 55c84f98..16bbf0ce 100644
--- a/src/hwpf/include/plat/plat_hw_access.H
+++ b/src/hwpf/plat_hw_access.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_hw_access.H $                      */
+/* $Source: src/hwpf/plat_hw_access.H $                                   */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_includes.H b/src/hwpf/plat_includes.H
index bc706f28..a0cd359d 100644
--- a/src/hwpf/include/plat/plat_includes.H
+++ b/src/hwpf/plat_includes.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_includes.H $                       */
+/* $Source: src/hwpf/plat_includes.H $                                    */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/src/plat_ring_traverse.C b/src/hwpf/plat_ring_traverse.C
index 9b4466a7..1a000e87 100644
--- a/src/hwpf/src/plat_ring_traverse.C
+++ b/src/hwpf/plat_ring_traverse.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/plat_ring_traverse.C $                           */
+/* $Source: src/hwpf/plat_ring_traverse.C $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_ring_traverse.H b/src/hwpf/plat_ring_traverse.H
index 54723051..cd5fbc29 100644
--- a/src/hwpf/include/plat/plat_ring_traverse.H
+++ b/src/hwpf/plat_ring_traverse.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_ring_traverse.H $                  */
+/* $Source: src/hwpf/plat_ring_traverse.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_target.H b/src/hwpf/plat_target.H
index 88d7e231..534a351a 100644
--- a/src/hwpf/include/plat/plat_target.H
+++ b/src/hwpf/plat_target.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_target.H $                         */
+/* $Source: src/hwpf/plat_target.H $                                      */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_target_definitions.H b/src/hwpf/plat_target_definitions.H
index 24991ebb..cf2112a3 100644
--- a/src/hwpf/include/plat/plat_target_definitions.H
+++ b/src/hwpf/plat_target_definitions.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_target_definitions.H $             */
+/* $Source: src/hwpf/plat_target_definitions.H $                          */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_target_filter.H b/src/hwpf/plat_target_filter.H
index 0e19fa71..e620dd70 100644
--- a/src/hwpf/include/plat/plat_target_filter.H
+++ b/src/hwpf/plat_target_filter.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_target_filter.H $                  */
+/* $Source: src/hwpf/plat_target_filter.H $                               */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_target_parms.H b/src/hwpf/plat_target_parms.H
index 79d9edf0..1a8fe9fa 100644
--- a/src/hwpf/include/plat/plat_target_parms.H
+++ b/src/hwpf/plat_target_parms.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_target_parms.H $                   */
+/* $Source: src/hwpf/plat_target_parms.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_target_utils.H b/src/hwpf/plat_target_utils.H
index 9d3e520f..0c54e2cc 100644
--- a/src/hwpf/include/plat/plat_target_utils.H
+++ b/src/hwpf/plat_target_utils.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_target_utils.H $                   */
+/* $Source: src/hwpf/plat_target_utils.H $                                */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_trace.H b/src/hwpf/plat_trace.H
index fcc87899..8a9344c6 100644
--- a/src/hwpf/include/plat/plat_trace.H
+++ b/src/hwpf/plat_trace.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_trace.H $                          */
+/* $Source: src/hwpf/plat_trace.H $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
-/* [+] International Business Machines Corp.                              */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/src/plat/plat_utils.C b/src/hwpf/plat_utils.C
index fe810f4f..4e4024e7 100644
--- a/src/hwpf/src/plat/plat_utils.C
+++ b/src/hwpf/plat_utils.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/plat/plat_utils.C $                              */
+/* $Source: src/hwpf/plat_utils.C $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/plat_utils.H b/src/hwpf/plat_utils.H
index eadee6aa..960aba0a 100644
--- a/src/hwpf/include/plat/plat_utils.H
+++ b/src/hwpf/plat_utils.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/plat_utils.H $                          */
+/* $Source: src/hwpf/plat_utils.H $                                       */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/src/Makefile b/src/hwpf/src/Makefile
deleted file mode 100644
index 4377a865..00000000
--- a/src/hwpf/src/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/hwpf/src/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# 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
-# This Makefile is designed to be invoked with the -I argument
-
-export SUB_OBJDIR = /fapi2
-
-include img_defs.mk
-include fapi2sbefiles.mk
-
-
-OBJS := $(addprefix $(OBJDIR)/, $(FAPI2LIB_OBJECTS))
-
-libfapi2.a: fapi2 hwpf plat
-	$(AR) crs $(OBJDIR)/libfapi2.a $(OBJDIR)/*.o
-
-.PHONY: clean fapi2 hwpf plat
-fapi2: $(OBJS)
-
-plat:
-	$(MAKE) -I $(BUILD_DIR) -C $(PLAT_FAPI2_DIR)/src/plat
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
-
diff --git a/src/hwpf/src/fapi2sbefiles.mk b/src/hwpf/src/fapi2sbefiles.mk
deleted file mode 100644
index e1bdf683..00000000
--- a/src/hwpf/src/fapi2sbefiles.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/hwpf/src/fapi2sbefiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
-#
-#
-# 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 fapi2ppefiles.mk
-#
-#  @brief mk for including fapi2 object files
-#
-#  @page ChangeLogs Change Logs
-#  @section fapi2ppefiles.mk
-#  @verbatim
-#
-#
-# Change Log ******************************************************************
-# Flag     Defect/Feature  User        Date         Description
-# ------   --------------  ----------  ------------ -----------
-#
-# @endverbatim
-#
-##########################################################################
-# Object Files
-##########################################################################
-
-FAPI2-C-SOURCES += ffdc.C
-FAPI2-C-SOURCES += plat_ring_traverse.C
-FAPI2-S-SOURCES =
-
-
-FAPI2LIB_OBJECTS += $(FAPI2-C-SOURCES:.C=.o) $(FAPI2-S-SOURCES:.S=.o)
-
diff --git a/src/hwpf/src/return_code.C b/src/hwpf/src/return_code.C
deleted file mode 100644
index b9d0f5fd..00000000
--- a/src/hwpf/src/return_code.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/hwpf/src/return_code.C $                                  */
-/*                                                                        */
-/* OpenPOWER sbe Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* 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 return_code.C
- *
- *  @brief Fuctions that process PPE return codes
- */
-
-#include <return_code.H>
-
-namespace fapi2
-{
-    
-    /// @brief Takes a non-zero PIB return code and inssert the value into 
-    /// a fapi2::ReturnCode
-    /// @param[in]  i_msr         Value read from the PPE MSR
-    /// @return fapi::ReturnCode. Built ReturnCode
-    ReturnCode&  ReturnCode::insertPIBcode(uint32_t& rhs)
-    {
-        iv_rc = FAPI2_RC_PLAT_MASK | rhs;
-        return iv_rc;
-    }
-
-}
diff --git a/src/hwpf/src/plat/target.C b/src/hwpf/target.C
index 8ab8f0f4..7287105e 100644
--- a/src/hwpf/src/plat/target.C
+++ b/src/hwpf/target.C
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/src/plat/target.C $                                  */
+/* $Source: src/hwpf/target.C $                                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
diff --git a/src/hwpf/include/plat/target.H b/src/hwpf/target.H
index 3bdfc4dc..190b3da3 100644
--- a/src/hwpf/include/plat/target.H
+++ b/src/hwpf/target.H
@@ -1,12 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/hwpf/include/plat/target.H $                              */
+/* $Source: src/hwpf/target.H $                                           */
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2017                        */
-/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */