PRD: Modified makefiles to remove all P8 references

Change-Id: I5e33802d2a5e0a01aae0be638cce0bce8afba0fe
RTC: 140081
Depends-on: Ic2ce697a99ed25204da374bf5616bae56cdf4450
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21866
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22615
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

10 files changed, 235 insertions, 62 deletions

diff --git a/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk b/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk
new file mode 100644
index 000000000..62f2a3b13
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk
@@ -0,0 +1,40 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/cen/prdf_plat_cen.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# 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.
+# 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
+
+# NOTE: PRD_SRC_PATH must be defined before including this file.
+
+################################################################################
+# Paths common to both FSP and Hostboot
+################################################################################
+
+prd_vpath += ${PRD_SRC_PATH}/common/plat/cen
+
+prd_incpath += ${PRD_SRC_PATH}/common/plat/cen
+
+################################################################################
+# Object files common to both FSP and Hostboot
+################################################################################
+
+
diff --git a/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk b/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk
new file mode 100644
index 000000000..d0e83e000
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk
@@ -0,0 +1,40 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/p9/prdf_plat_p9.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# 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.
+# 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
+
+# NOTE: PRD_SRC_PATH must be defined before including this file.
+
+################################################################################
+# Paths common to both FSP and Hostboot
+################################################################################
+
+prd_vpath += ${PRD_SRC_PATH}/common/plat/p9
+
+prd_incpath += ${PRD_SRC_PATH}/common/plat/p9
+
+################################################################################
+# Object files common to both FSP and Hostboot
+################################################################################
+
+
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdf_plat_p8.mk b/src/usr/diag/prdf/common/plat/pegasus/prdf_plat_p8.mk
new file mode 100644
index 000000000..ebd4f5430
--- /dev/null
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdf_plat_p8.mk
@@ -0,0 +1,73 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/pegasus/prdf_plat_p8.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# 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.
+# 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
+
+# NOTE: PRD_SRC_PATH must be defined before including this file.
+
+################################################################################
+# Paths common to both FSP and Hostboot
+################################################################################
+
+prd_vpath += ${PRD_SRC_PATH}/common/plat/pegasus
+
+prd_incpath += ${PRD_SRC_PATH}/common/plat/pegasus
+
+################################################################################
+# Object files common to both FSP and Hostboot
+################################################################################
+
+# common/plat/pegasus/ (non-rule plugin related)
+prd_obj += prdfCalloutUtil.o
+prd_obj += prdfCenAddress.o
+prd_obj += prdfCenDqBitmap.o
+prd_obj += prdfCenMbaCaptureData.o
+prd_obj += prdfCenMbaCeTable.o
+prd_obj += prdfCenMbaRceTable.o
+prd_obj += prdfCenMbaTdCtlr_common.o
+prd_obj += prdfCenMbaThresholds_common.o
+prd_obj += prdfCenMbaUeTable.o
+prd_obj += prdfCenMemUtils.o
+prd_obj += prdfCenSymbol.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
+prd_obj += prdfPllDomain.o
+prd_obj += prdfPhbUtils.o
+prd_obj += prdfPlatUtil.o
+
+# common/plat/pegasus/ (rule plugin related)
+prd_rule_plugin += prdfCenMba.o
+prd_rule_plugin += prdfCenMembuf.o
+prd_rule_plugin += prdfCenPll.o
+prd_rule_plugin += prdfP8Ex.o
+prd_rule_plugin += prdfP8Mcs.o
+prd_rule_plugin += prdfP8Pll.o
+prd_rule_plugin += prdfP8PllPcie.o
+prd_rule_plugin += prdfP8Proc.o
+prd_rule_plugin += prdfPllUtils.o
+
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 b5a5177f1..b38595e17 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
@@ -33,7 +33,6 @@ prd_vpath += ${PRD_SRC_PATH}/common
 prd_vpath += ${PRD_SRC_PATH}/common/include
 prd_vpath += ${PRD_SRC_PATH}/common/mnfgtools
 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/util
@@ -41,7 +40,6 @@ prd_vpath += ${PRD_SRC_PATH}/common/util
 prd_incpath += ${PRD_SRC_PATH}/common
 prd_incpath += ${PRD_SRC_PATH}/common/mnfgtools
 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/util
@@ -63,40 +61,6 @@ 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
-#prd_obj += prdfCenAddress.o
-#prd_obj += prdfCenDqBitmap.o
-#prd_obj += prdfCenMbaCaptureData.o
-#prd_obj += prdfCenMbaCeTable.o
-#prd_obj += prdfCenMbaRceTable.o
-#prd_obj += prdfCenMbaTdCtlr_common.o
-#prd_obj += prdfCenMbaThresholds_common.o
-#prd_obj += prdfCenMbaUeTable.o
-#prd_obj += prdfCenMemUtils.o
-#prd_obj += prdfCenSymbol.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
-#prd_obj += prdfPllDomain.o
-#prd_obj += prdfPhbUtils.o
-#prd_obj += prdfPlatUtil.o
-
-# common/plat/pegasus/ (rule plugin related)
-#prd_rule_plugin += prdfCenMba.o
-#prd_rule_plugin += prdfCenMembuf.o
-#prd_rule_plugin += prdfCenPll.o
-#prd_rule_plugin += prdfP8Ex.o
-#prd_rule_plugin += prdfP8Mcs.o
-#prd_rule_plugin += prdfP8Pll.o
-#prd_rule_plugin += prdfP8PllPcie.o
-#prd_rule_plugin += prdfP8Proc.o
-#prd_rule_plugin += prdfPllUtils.o
-
 # common/plugins/ (errl plugin related)
 prd_obj += prdfParserUtils.o
 
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index c70d1ce36..149991f3b 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -38,6 +38,8 @@ include prdf_hb_only.mk # Will define PRD_SRC_PATH and PRD_INC_PATH
 # PRD_SRC_PATH and PRD_INC_PATH must be defined before including these files.
 include common/prdf_common_fsp_and_hb.mk
 include common/framework/prdf_framework.mk
+include common/plat/p9/prdf_plat_p9.mk
+include common/plat/cen/prdf_plat_cen.mk
 
 VPATH += ${prd_vpath}
 
diff --git a/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk b/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk
new file mode 100644
index 000000000..e9eb6ee33
--- /dev/null
+++ b/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk
@@ -0,0 +1,77 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# 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.
+# 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
+
+# NOTE: PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file
+
+################################################################################
+# Paths common to both IPL and runtime
+################################################################################
+
+prd_vpath += ${PRD_SRC_PATH}/plat/pegasus
+
+prd_incpath += ${PRD_SRC_PATH}/plat/pegasus
+
+################################################################################
+# Hostboot only object files common to both IPL and runtime
+################################################################################
+
+# plat/pegasus/ (rule plugin related)
+prd_rule_plugin += prdfP8TodPlugins.o
+prd_rule_plugin += prdfPlatCenMemUtils.o
+prd_rule_plugin += prdfPlatCenPll.o
+prd_rule_plugin += prdfPlatP8Ex.o
+prd_rule_plugin += prdfPlatP8Proc.o
+
+################################################################################
+# Hostboot only object files (IPL only)
+################################################################################
+
+ifneq (${HOSTBOOT_RUNTIME},1)
+
+# plat/pegasus/ (non-rule plugin related)
+prd_obj += prdfCenMbaIplCeStats.o
+prd_obj += prdfCenMbaTdCtlr_ipl.o
+prd_obj += prdfDramRepairs.o
+prd_obj += prdfMbaDomain.o
+prd_obj += prdfPlatCalloutUtil.o
+
+# plat/pegasus/ (rule plugin related)
+prd_rule_plugin += prdfPlatCenMba_ipl.o
+
+endif
+
+################################################################################
+# Hostboot only object files (runtime only)
+################################################################################
+
+ifeq (${HOSTBOOT_RUNTIME},1)
+
+# common/plat/pegasus/
+prd_obj += prdfCenMbaDynMemDealloc_rt.o
+prd_obj += prdfCenMbaTdCtlr_rt.o
+prd_obj += prdfCenMbaTdRankData_rt.o
+
+endif
+
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index a73a041fa..e6b09cd24 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -38,7 +38,6 @@ prd_vpath += ${PRD_SRC_PATH}/framework
 prd_vpath += ${PRD_SRC_PATH}/mnfgtools
 prd_vpath += ${PRD_SRC_PATH}/occ_firdata
 prd_vpath += ${PRD_SRC_PATH}/plat
-prd_vpath += ${PRD_SRC_PATH}/plat/pegasus
 
 # Internal PRD header paths
 prd_incpath += ${PRD_INC_PATH}        # Stored differently in FSP
@@ -48,7 +47,6 @@ prd_incpath += ${PRD_SRC_PATH}/framework
 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
 prd_incpath += ${ROOTPATH}/src/include/usr/ecmddatabuffer
@@ -75,13 +73,6 @@ prd_obj += prdfDumpResolution.o
 prd_obj += prdfPlatServices.o
 prd_obj += prdfRasServices.o
 
-# plat/pegasus/ (rule plugin related)
-#prd_rule_plugin += prdfP8TodPlugins.o
-#prd_rule_plugin += prdfPlatCenMemUtils.o
-#prd_rule_plugin += prdfPlatCenPll.o
-#prd_rule_plugin += prdfPlatP8Ex.o
-#prd_rule_plugin += prdfPlatP8Proc.o
-
 ################################################################################
 # Hostboot only object files (IPL only)
 ################################################################################
@@ -105,16 +96,6 @@ 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
-#prd_obj += prdfDramRepairs.o
-#prd_obj += prdfMbaDomain.o
-#prd_obj += prdfPlatCalloutUtil.o
-
-# plat/pegasus/ (rule plugin related)
-#prd_rule_plugin += prdfPlatCenMba_ipl.o
-
 endif
 
 ################################################################################
@@ -126,11 +107,6 @@ ifeq (${HOSTBOOT_RUNTIME},1)
 # plat/
 prd_obj += prdfPlatServices_rt.o
 
-# common/plat/pegasus/
-#prd_obj += prdfCenMbaDynMemDealloc_rt.o
-#prd_obj += prdfCenMbaTdCtlr_rt.o
-#prd_obj += prdfCenMbaTdRankData_rt.o
-
 endif
 
 ################################################################################
diff --git a/src/usr/diag/prdf/rule/makefile b/src/usr/diag/prdf/rule/makefile
index 19a380c4f..790619a35 100755
--- a/src/usr/diag/prdf/rule/makefile
+++ b/src/usr/diag/prdf/rule/makefile
@@ -87,7 +87,7 @@ SOURCE_PLUGIN_DIRS += ${SRC_USR}/plugins
 SOURCE_PLUGIN_FILES += ${SRC_USR}/common/rule/prdf_rule.mk
 SOURCE_PLUGIN_FILES += ${SRC_USR}/common/rule/tables.mk
 SOURCE_PLUGIN_FILES += ${SRC_USR}/common/util/UtilHash.H
-SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H
+#SOURCE_PLUGIN_FILES += ${SRC_USR}/common/plat/pegasus/prdfCenConst.H TODO RTC 136128
 SOURCE_PLUGIN_FILES += ${SRC_USR}/common/iipconst.h
 SOURCE_PLUGIN_FILES += ${SRC_USR}/common/prdf_types.h
 SOURCE_PLUGIN_FILES += ${SRC_INC}/common/prdf_service_codes.H
diff --git a/src/usr/diag/prdf/runtime/makefile b/src/usr/diag/prdf/runtime/makefile
index 7843c011e..9d321627f 100644
--- a/src/usr/diag/prdf/runtime/makefile
+++ b/src/usr/diag/prdf/runtime/makefile
@@ -37,6 +37,8 @@ include ../prdf_hb_only.mk  # Will define PRD_SRC_PATH and PRD_INC_PATH
 # PRD_SRC_PATH and PRD_INC_PATH must be defined before including these files.
 include ../common/prdf_common_fsp_and_hb.mk
 include ../common/framework/prdf_framework.mk
+include ../common/plat/p9/prdf_plat_p9.mk
+include ../common/plat/cen/prdf_plat_cen.mk
 
 VPATH += ${prd_vpath}
 
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 855d1badd..c7d80045d 100755
--- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk
+++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
@@ -43,7 +43,6 @@ EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/resolution
 EXTRAINCDIR += ${PRD_USR_PATH}/common/framework/config
 EXTRAINCDIR += ${PRD_USR_PATH}/common/rule
 EXTRAINCDIR += ${PRD_USR_PATH}/common/plat
-EXTRAINCDIR += ${PRD_USR_PATH}/common/plat/pegasus
 EXTRAINCDIR += ${PRD_USR_PATH}/common/mnfgtools
 EXTRAINCDIR += ${PRD_USR_PATH}/mnfgtools
 EXTRAINCDIR += ${PRD_USR_PATH}/framework