PRD: refactored prdf_hb_only.mk

Change-Id: Iaa2648b53f64da11e851ea1f944a8e6e0e7a5e1c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14343
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14497

3 files changed, 9 insertions, 52 deletions

diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index 21577fe1c..4ea2d7c50 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -98,11 +98,6 @@ endif
 # objects
 #------------------------------------------------------------------------------
 
-include prdf_hb_only.mk
-
-OBJS += ${prd_object_files_HB}
-OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_HB}
-
 include common/prdf_common_fsp_and_hb.mk
 include prdf_common_hb_only.mk
 
diff --git a/src/usr/diag/prdf/prdf_common_hb_only.mk b/src/usr/diag/prdf/prdf_common_hb_only.mk
index b620bc2f3..f4cd351f7 100644
--- a/src/usr/diag/prdf/prdf_common_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_common_hb_only.mk
@@ -38,15 +38,24 @@ prd_obj += prdfDumpResolution.o
 
 # framework/service/
 prd_obj_no_sim += prdfPlatServices.o
+prd_obj += prdfRasServices.o
+
+# mnfgtools/
+prd_obj += prdfMfgSync.o
+prd_obj += prdfMfgThresholdFile.o
 
 # plat/pegasus/ (non-rule plugin related)
+prd_obj += prdfCenMbaIplCeStats.o
 prd_obj += prdfCenMbaTdCtlr.o
+prd_obj += prdfDramRepairs.o
+prd_obj += prdfPlatCalloutUtil.o
 prd_obj += prdfPllUtils.o
 
 # plat/pegasus/ (rule plugin related)
 prd_rule_plugin += prdfP8TodPlugins.o
 prd_rule_plugin += prdfPlatCenMba.o
 prd_rule_plugin += prdfPlatCenMemUtils.o
+prd_rule_plugin += prdfPlatCenPll.o
 prd_rule_plugin += prdfPlatP8Ex.o
 prd_rule_plugin += prdfPlatP8Proc.o
 
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
deleted file mode 100644
index b0087498f..000000000
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/usr/diag/prdf/prdf_hb_only.mk $
-#
-# OpenPOWER HostBoot Project
-#
-# Contributors Listed Below - COPYRIGHT 2013,2014
-# [+] 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
-
-################################################################################
-# PRD rule plugin object files (Hostboot only).
-################################################################################
-
-PRDF_RULE_PLUGINS_PEGASUS_HB = \
-	prdfPlatCenPll.o
-
-################################################################################
-# PRD object files (Hostboot only).
-################################################################################
-
-prd_mnfgtools_HB += prdfMfgThresholdFile.o
-prd_mnfgtools_HB += prdfMfgSync.o
-
-prd_plat_HB += prdfCenMbaIplCeStats.o
-prd_plat_HB += prdfDramRepairs.o
-prd_plat_HB += prdfRasServices.o
-prd_plat_HB += prdfPlatCalloutUtil.o
-
-prd_object_files_HB += ${prd_config_HB}
-prd_object_files_HB += ${prd_mnfgtools_HB}
-prd_object_files_HB += ${prd_plat_HB}