PRD: Moved P8 common runtime code to common/plat/pegasus/

Change-Id: I7174032645f1118f054e262ef6db9b6df1fac75a
RTC: 140081
Depends-on: I950a1eba9abe3a80a75b00ab3c82696167141554
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21862
Tested-by: Jenkins Server
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22139

11 files changed, 31 insertions, 35 deletions

diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle_rt.H
index 34d52c183..77af0d487 100644..100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaDataBundle_rt.H $  */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle_rt.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_rt.C
index 823649baa..e8ab075fb 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_rt.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.C $ */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_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/common/runtime/prdfCenMbaDynMemDealloc_rt.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_rt.H
index f02f13860..5622ff188 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaDynMemDealloc_rt.H $ */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDynMemDealloc_rt.H $ */
 /*                                                                        */
 /* 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/common/runtime/prdfCenMbaTdCtlr_rt.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
index ddf02b414..51aba3c98 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.C $      */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.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/common/runtime/prdfCenMbaTdCtlr_rt.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H
index 29394923f..7441fad5a 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaTdCtlr_rt.H $      */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_rt.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,8 +31,8 @@
 #define __prdfCenMbaTdCtlr_rt_H
 
 // Pegasus includes
-#include <prdfCenMbaTdQueue.H>
-#include <prdfCenMbaTdRankData.H>
+#include <prdfCenMbaTdQueue_rt.H>
+#include <prdfCenMbaTdRankData_rt.H>
 
 // Should be included last in case there are any platform specific includes that
 // the common code needs.
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdQueue_rt.H
index ba55cd763..56fcc2511 100755
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdQueue_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaTdQueue.H $        */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdQueue_rt.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -23,12 +23,12 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-/** @file  prdfCenMbaTdQueue.H
+/** @file  prdfCenMbaTdQueue_rt.H
  *  @brief Support code for a Targeted Diagnostics weighted event queue.
  */
 
-#ifndef PRDF_CEN_MBA_TD_QUEUE_H
-#define PRDF_CEN_MBA_TD_QUEUE_H
+#ifndef PRDF_CEN_MBA_TD_QUEUE_RT_H
+#define PRDF_CEN_MBA_TD_QUEUE_RT_H
 
 // Framework includes
 #include <prdf_types.h>
@@ -178,4 +178,4 @@ class TdQueue
 
 } // end namespace PRDF
 
-#endif // PRDF_CEN_MBA_TD_QUEUE_H
+#endif // PRDF_CEN_MBA_TD_QUEUE_RT_H
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.C
index 0e1999db1..cdf374113 100644
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.C $     */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.C $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -23,9 +23,9 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-/** @file prdfCenMbaTdRankData.C */
+/** @file prdfCenMbaTdRankData_rt.C */
 
-#include <prdfCenMbaTdRankData.H>
+#include <prdfCenMbaTdRankData_rt.H>
 
 // Framework includes
 #include <prdfTrace.H>
diff --git a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.H
index 94833e244..2c593fec8 100644
--- a/src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/diag/prdf/common/runtime/prdfCenMbaTdRankData.H $     */
+/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdRankData_rt.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2016                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -23,10 +23,10 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-#ifndef __prdfCenMbaTdRankData_H
-#define __prdfCenMbaTdRankData_H
+#ifndef __prdfCenMbaTdRankData_rt_H
+#define __prdfCenMbaTdRankData_rt_H
 
-/** @file prdfCenMbaTdRankData.H */
+/** @file prdfCenMbaTdRankData_rt.H */
 
 // Framework includes
 #include <prdfPlatServices.H>
@@ -342,5 +342,5 @@ class TpsRankData
 
 } // end namespace PRDF
 
-#endif // __prdfCenMbaTdRankData_H
+#endif // __prdfCenMbaTdRankData_rt_H
 
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 fb605fd47..2dfeb613d 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
@@ -40,7 +40,6 @@ prd_vpath += ${PRD_SRC_PATH}/common/plat
 prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus
 prd_vpath += ${PRD_SRC_PATH}/common/plugins
 prd_vpath += ${PRD_SRC_PATH}/common/rule
-prd_vpath += ${PRD_SRC_PATH}/common/runtime
 prd_vpath += ${PRD_SRC_PATH}/common/util
 
 prd_incpath += ${PRD_SRC_PATH}/common
@@ -53,7 +52,6 @@ prd_incpath += ${PRD_SRC_PATH}/common/plat
 prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus
 prd_incpath += ${PRD_SRC_PATH}/common/plugins
 prd_incpath += ${PRD_SRC_PATH}/common/rule
-prd_incpath += ${PRD_SRC_PATH}/common/runtime
 prd_incpath += ${PRD_SRC_PATH}/common/util
 
 ################################################################################
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index c9c10d2a1..d21316114 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -132,10 +132,10 @@ ifeq (${HOSTBOOT_RUNTIME},1)
 # plat/
 prd_obj += prdfPlatServices_rt.o
 
-# common/runtime/
+# common/plat/pegasus/
 #prd_obj += prdfCenMbaDynMemDealloc_rt.o
 #prd_obj += prdfCenMbaTdCtlr_rt.o
-#prd_obj += prdfCenMbaTdRankData.o
+#prd_obj += prdfCenMbaTdRankData_rt.o
 
 endif
 
diff --git a/src/usr/diag/prdf/runtime/test/makefile b/src/usr/diag/prdf/runtime/test/makefile
index 0b09790c7..5521573e6 100644
--- a/src/usr/diag/prdf/runtime/test/makefile
+++ b/src/usr/diag/prdf/runtime/test/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -31,8 +31,6 @@ VPATH += ../../test
 #ROOTPATH must be defined before including prdf_hb_common_test.mk
 include ../../test/prdf_hb_common_test.mk
 
-EXTRAINCDIR += ${PRD_USR_PATH}/common/runtime
-
 #------------------------------------------------------------------------------
 # objects
 #------------------------------------------------------------------------------