PRD: Refactor prdfPlatServices

The prdfPlatServices_common.[HC] files should only contain code that is
common between FSP and Hostboot.

The prdfTargetServices.[HC] files should only contain code specific to
the common FSP/Hostboot targeting code.

The FSP prdfPlatServices.[HC] and Hostboot prdfPlatServices.[HC] files
will contain code that is specific to FSP or Hostboot, respectively.

Only prdfPlatServices_common.H will include prdfTargetServices.H.

Only the prdfPlatServices.H files will include prdfPlatServices_common.H.

All user code should include the respective prdfPlatServices.H file.

Change-Id: I6e723d6e6602194abfc24ee9c20c1949c393c0e2
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3041
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3213

1 files changed, 17 insertions, 57 deletions

diff --git a/src/usr/diag/prdf/common/prd_framework.mk b/src/usr/diag/prdf/common/prd_framework.mk
index 9abedbc8f..64b9f80c8 100755
--- a/src/usr/diag/prdf/common/prd_framework.mk
+++ b/src/usr/diag/prdf/common/prd_framework.mk
@@ -21,21 +21,15 @@
 #
 # IBM_PROLOG_END_TAG
 
-# Object files for prd shared library
-
-######## Framework ########
+################################################################################
+# PRD object files (common Hostboot and FSP).
+################################################################################
 
 prd_framework = \
  iipTemplates.o \
  prdfTrace.o \
  prdfMain.o
 
-prd_framework_includes = \
- prdfMain.H \
- prdf_service_codes.H
-
-######## Util ########
-
 prd_util = \
  prdfBitString.o \
  prdfBitKey.o \
@@ -45,11 +39,6 @@ prd_util = \
  prdfFilters.o \
  prdfAssert.o
 
-prd_util_includes = \
- prdfCompressBuffer.H
-
-######## Config ########
-
 prd_config = \
  iipchip.o \
  iipConfigurator.o \
@@ -62,44 +51,15 @@ prd_config = \
  iipSystem.o \
  prdfExtensibleDomain.o \
 
-prd_config_FSP = \
- prdfChipPersist.o \
- prdfSystemData.o
-
-prd_config_includes = \
-
-######## Service ########
-
 prd_service = \
  prdfServiceDataCollector.o \
  prdf_ras_services.o \
  prdfTargetServices.o \
  xspprdsdbug.o
 
-prd_service_FSP = \
- prdfSdcFileControl.o
-
-prd_service_includes = \
-
-######## Platform Specfic Services ########
-
-prd_env_service = \
- prdfHomRegisterAccess.o \
- prdfPlatServices.o
-
-prd_env_service_includes = \
-
-######## Chip ########
-
 prd_ss = \
  prdfMemoryMru.o
 
-prd_ss_includes = \
- prdfMemoryMru.H \
- prdfRepairHealth.H
-
-######## Resolution ########
-
 prd_resolution = \
  iipResolution.o \
  iipResolutionFactory.o \
@@ -111,10 +71,6 @@ prd_resolution = \
  prdfClockResolution.o \
  prdfCaptureResolution.o
 
-prd_resolution_includes = \
-
-######## Register ########
-
 prd_register = \
  iipscr.o \
  prdfErrorRegister.o \
@@ -126,16 +82,20 @@ prd_register = \
  prdfCaptureData.o \
  prdfScanFacility.o
 
+prd_object_files = \
+ ${prd_framework} \
+ ${prd_util} \
+ ${prd_config} \
+ ${prd_service} \
+ ${prd_ss} \
+ ${prd_resolution} \
+ ${prd_register} \
 
-prd_register_includes = \
+################################################################################
+# PRD object files common to Hostboot and FSP, but not to PRD simulator.
+################################################################################
 
-######## Threshold ########
-
-prd_mnfgtools = \
- prdfMfgThresholdFile.o \
- prdfMfgThresholdMgr.o \
- prdfMesThresholds.o
+prd_object_files_no_sim = \
+ prdfHomRegisterAccess.o \
+ prdfPlatServices_common.o prdfPlatServices.o
 
-prd_mnfgtools_includes = \
- prdfMfgThresholds.H \
- prdfMesThresholds.H