PRD: moved PlatServices code to plat/ directory

Change-Id: I950a1eba9abe3a80a75b00ab3c82696167141554
RTC: 140081
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21861
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22138
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

20 files changed, 49 insertions, 46 deletions

diff --git a/src/usr/diag/prdf/common/plat/prdfLineDelete.C b/src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.C
index 90889326c..e94bab4a7 100755
--- a/src/usr/diag/prdf/common/plat/prdfLineDelete.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/prdfLineDelete.C $              */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.C $      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/plat/prdfLineDelete.H b/src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.H
index 6a0e89be7..4e0fbcb95 100755
--- a/src/usr/diag/prdf/common/plat/prdfLineDelete.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/prdfLineDelete.H $              */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfLineDelete.H $      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/plat/prdfTOD.H b/src/usr/diag/prdf/common/plat/pegasus/prdfTOD.H
index 75ee23833..38ad4dc5e 100755
--- a/src/usr/diag/prdf/common/plat/prdfTOD.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfTOD.H
@@ -1,11 +1,13 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/prdfTOD.H $                     */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfTOD.H $             */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2010,2014              */
+/* Contributors Listed Below - COPYRIGHT 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.       */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
index da8673873..3477780be 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfPlatServices_common.C $     */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.H
index b023a8f79..540262d3d 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_common.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfPlatServices_common.H $     */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/runtime/prdfPlatServices_rt.H b/src/usr/diag/prdf/common/plat/prdfPlatServices_rt.H
index 5699d327e..7f5956c24 100644
--- a/src/usr/diag/prdf/common/runtime/prdfPlatServices_rt.H
+++ b/src/usr/diag/prdf/common/plat/prdfPlatServices_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfPlatServices_rt.H $      */
+/* $Source: src/usr/diag/prdf/common/plat/prdfPlatServices_rt.H $         */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -36,9 +36,6 @@ namespace PlatServices
 //##                        Memory specific functions
 //##############################################################################
 
-// TODO: RTC 124850 need to add support for this.
-inline bool isPredDynDeallocEnabled() { return false; }
-
 /**
  * @brief Communicates a page gard request to the hypervisor.
  * @param i_systemAddress Any address in the target page.
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
index fcd779e22..ee430239a 100644..100755
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfRasServices_common.C $      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H b/src/usr/diag/prdf/common/plat/prdfRasServices_common.H
index 58138aa64..537504c85 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
+++ b/src/usr/diag/prdf/common/plat/prdfRasServices_common.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfRasServices_common.H $      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index ffa0bfbbb..6e3be96f5 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfTargetServices.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfTargetServices.C $          */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H b/src/usr/diag/prdf/common/plat/prdfTargetServices.H
index addae1913..571707357 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.H
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/service/prdfTargetServices.H $ */
+/* $Source: src/usr/diag/prdf/common/plat/prdfTargetServices.H $          */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
index a46f966c4..fb605fd47 100644
--- a/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
+++ b/src/usr/diag/prdf/common/prdf_common_fsp_and_hb.mk
@@ -96,10 +96,7 @@ prd_obj += prdfThresholdResolutions.o
 prd_obj += xspprdFlagResolution.o
 
 # common/framework/service/
-prd_obj_no_sim += prdfPlatServices_common.o
-prd_obj += prdfRasServices_common.o
 prd_obj += prdfServiceDataCollector.o
-prd_obj += prdfTargetServices.o
 prd_obj += xspprdsdbug.o
 
 # common/mnfgtools/
@@ -107,7 +104,9 @@ prd_obj += prdfMfgThreshold.o
 prd_obj += prdfMfgThresholdMgr.o
 
 # common/plat/
-prd_obj += prdfLineDelete.o
+prd_obj_no_sim += prdfPlatServices_common.o
+prd_obj += prdfRasServices_common.o
+prd_obj += prdfTargetServices.o
 
 # common/plat/pegasus/ (non-rule plugin related)
 #prd_obj += prdfCalloutUtil.o
@@ -124,6 +123,7 @@ prd_obj += prdfLineDelete.o
 #prd_obj += prdfFabricDomain.o
 #prd_obj += prdfFsiCapUtil.o
 #prd_obj += prdfLaneRepair.o
+#prd_obj += prdfLineDelete.o
 #prd_obj += prdfMemoryMru.o
 #prd_obj += prdfPciOscSwitchDomain.o
 #prd_obj += prdfPegasusConfigurator.o
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C
index 66e5ed23f..781b8528f 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices.C $      */
+/* $Source: src/usr/diag/prdf/plat/prdfPlatServices.C $                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/plat/prdfPlatServices.H
index aef0c8763..00cbb4e32 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/plat/prdfPlatServices.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices.H $      */
+/* $Source: src/usr/diag/prdf/plat/prdfPlatServices.H $                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
index 614b24c9a..edad4f39a 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C $  */
+/* $Source: src/usr/diag/prdf/plat/prdfPlatServices_ipl.C $               */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.H
index d9c05237d..177e38c15 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_ipl.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H $  */
+/* $Source: src/usr/diag/prdf/plat/prdfPlatServices_ipl.H $               */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
index dad82a0b3..98d7d73b9 100644
--- a/src/usr/diag/prdf/runtime/prdfPlatServices_rt.C
+++ b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/runtime/prdfPlatServices_rt.C $             */
+/* $Source: src/usr/diag/prdf/plat/prdfPlatServices_rt.C $                */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfRasServices.C b/src/usr/diag/prdf/plat/prdfRasServices.C
index 747042550..b40ce55ba 100644
--- a/src/usr/diag/prdf/framework/service/prdfRasServices.C
+++ b/src/usr/diag/prdf/plat/prdfRasServices.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfRasServices.C $       */
+/* $Source: src/usr/diag/prdf/plat/prdfRasServices.C $                    */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/framework/service/prdfRasServices.H b/src/usr/diag/prdf/plat/prdfRasServices.H
index 2a41a54ab..4d1ef12f3 100644
--- a/src/usr/diag/prdf/framework/service/prdfRasServices.H
+++ b/src/usr/diag/prdf/plat/prdfRasServices.H
@@ -1,11 +1,13 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/framework/service/prdfRasServices.H $       */
+/* $Source: src/usr/diag/prdf/plat/prdfRasServices.H $                    */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 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.       */
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index dca2f0174..c9c10d2a1 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -53,6 +53,7 @@ prd_incpath += ${PRD_SRC_PATH}/framework/register
 prd_incpath += ${PRD_SRC_PATH}/framework/service
 prd_incpath += ${PRD_SRC_PATH}/mnfgtools
 prd_incpath += ${PRD_SRC_PATH}/occ_firdata
+prd_incpath += ${PRD_SRC_PATH}/plat
 prd_incpath += ${PRD_SRC_PATH}/plat/pegasus
 
 # External header paths
@@ -76,7 +77,7 @@ prd_obj += prdfMain.o
 # framework/resolution/
 prd_obj += prdfDumpResolution.o
 
-# framework/service/
+# plat/
 prd_obj += prdfPlatServices.o
 prd_obj += prdfRasServices.o
 
@@ -99,9 +100,6 @@ prd_obj += prdfMain_ipl.o
 # framework/register
 prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfFileRegisterAccess.o)
 
-# framework/service/
-prd_obj += prdfPlatServices_ipl.o
-
 # mnfgtools/
 prd_obj += prdfMfgSync.o
 
@@ -110,6 +108,9 @@ prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfPnorFirDataReader.o)
 prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfReadPnorFirData.o)
 prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfWriteHomerFirData.o)
 
+# plat/
+prd_obj += prdfPlatServices_ipl.o
+
 # plat/pegasus/ (non-rule plugin related)
 #prd_obj += prdfCenMbaIplCeStats.o
 #prd_obj += prdfCenMbaTdCtlr_ipl.o
@@ -128,7 +129,7 @@ endif
 
 ifeq (${HOSTBOOT_RUNTIME},1)
 
-# runtime/
+# plat/
 prd_obj += prdfPlatServices_rt.o
 
 # common/runtime/
diff --git a/src/usr/diag/prdf/test/prdf_hb_common_test.mk b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
index 2b61a820b..f85ee1dd9 100755
--- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk
+++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
@@ -48,6 +48,7 @@ EXTRAINCDIR += ${PRD_USR_PATH}/common/mnfgtools
 EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools
 EXTRAINCDIR += ${PRD_USR_PATH}/framework/service
 EXTRAINCDIR += ${PRD_USR_PATH}/occ_firdata
+EXTRAINCDIR += ${PRD_USR_PATH}/plat
 EXTRAINCDIR += ${PRD_USR_PATH}/test
 
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer