PRD: disabled references to legacy FAPI interfaces.

Simply commented out the current code and added RTC tags to reference
stories that will restore the functionality when FAPI2 is available.
Also disabled compilation of all the platform plugin code since
that code is the most common user of the legacy FAPI interfaces and
most of it will be rewritten for P9 anyway.

Change-Id: I8cb57c7343e71c83ab9017abfc715198eedbb9f4
RTC: 143877
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23369
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23676
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

13 files changed, 272 insertions, 163 deletions

diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
index 7fa98bb29..39334573e 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -33,13 +33,13 @@
 #define prdfHomRegisterAccess_C
 
 #ifdef __HOSTBOOT_MODULE
-  #include <ecmdDataBufferBase.H>
+//  #include <ecmdDataBufferBase.H> TODO RTC 144696
   #include <ibscomreasoncodes.H>
 #else
   #include <ecmdDataBuffer.H>
   #include <hwsvExecutionService.H>
   #include <hwco_service_codes.H>
-  #include <p8_pore_table_gen_api.H>
+//  #include <p8_pore_table_gen_api.H> TODO RTC 136050
 #endif
 
 #include <prdfHomRegisterAccess.H>
@@ -195,10 +195,12 @@ errlHndl_t ScomAccessor::Access(TargetHandle_t i_target,
     PRDF_DENTER("ScomAccessor::Access()");
 
     errlHndl_t errH = NULL;
-    uint32_t bsize = bs.GetLength();
 
     if(i_target != NULL)
     {
+/* TODO RTC 144696
+        uint32_t bsize = bs.GetLength();
+
         #ifdef __HOSTBOOT_MODULE
 
         ecmdDataBufferBase buffer(bsize);
@@ -225,7 +227,9 @@ errlHndl_t ScomAccessor::Access(TargetHandle_t i_target,
                                  buffer);
 
                 #ifndef __HOSTBOOT_MODULE
+*/
 
+/* TODO RTC 136050
                 if( NULL != errH ) break;
 
                 // If register is in a EX chiplet, need to update PORE image.
@@ -270,6 +274,9 @@ errlHndl_t ScomAccessor::Access(TargetHandle_t i_target,
                         }
                     }
                 }
+*/
+
+/* TODO RTC 144696
                 #endif // End of, not __HOSTBOOT_MODULE
 
                 break;
@@ -297,6 +304,7 @@ errlHndl_t ScomAccessor::Access(TargetHandle_t i_target,
                 break;
 
         } // end switch operation
+*/
 
     }
     else // Invalid target
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
index f73494615..b19a8b382 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
@@ -40,17 +40,17 @@
 #include <prdfErrlUtil.H>
 
 #include <prdfCenAddress.H>
-#include <prdfCenDqBitmap.H>
+//#include <prdfCenDqBitmap.H>
 #include <prdfCenMarkstore.H>
 
-#include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap()
+//#include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap() TODO RTC
 
-#include <io_read_erepair.H>
-#include <io_power_down_lanes.H>
-#include <io_clear_firs.H>
-#include <erepairAccessorHwpFuncs.H>
-#include <io_fir_isolation.H>
-#include <fapiAttributeIds.H>
+//#include <io_read_erepair.H> TODO RTC 136120
+//#include <io_power_down_lanes.H> TODO RTC 136120
+//#include <io_clear_firs.H> TODO RTC 136120
+//#include <erepairAccessorHwpFuncs.H> TODO RTC 136120
+//#include <io_fir_isolation.H> TODO RTC 136120
+//#include <fapiAttributeIds.H> TODO RTC 136120
 #ifdef __HOSTBOOT_MODULE
 #include <config.h>
 #endif
@@ -69,6 +69,7 @@ namespace PlatServices
 //##                     Utility Functions (for this file only)
 //##############################################################################
 
+/* TODO RTC 144700
 fapi::TargetType getFapiType( TARGETING::TargetHandle_t i_target )
 {
     fapi::TargetType o_type = fapi::TARGET_TYPE_NONE;
@@ -88,6 +89,7 @@ fapi::TargetType getFapiType( TARGETING::TargetHandle_t i_target )
 
     return o_type;
 }
+*/
 
 //##############################################################################
 //##                     System Level Utility Functions
@@ -101,16 +103,18 @@ void getECIDString( TargetHandle_t i_target, char * o_ecidStr )
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 144700
 fapi::Target getFapiTarget( TARGETING::TargetHandle_t i_target )
 {
     return fapi::Target( getFapiType(i_target), i_target );
 }
-
+*/
 
 //##############################################################################
 //##                       Lane Repair functions
 //##############################################################################
 
+/* TODO RTC 136120
 int32_t readErepair(TargetHandle_t i_rxBusTgt,
                     std::vector<uint8_t> &o_rxFailLanes)
 {
@@ -283,10 +287,13 @@ int32_t erepairFirIsolation(TargetHandle_t i_rxBusTgt)
 
     #undef PRDF_FUNC
 }
+*/
 
 //##############################################################################
 //##                        Processor specific functions
 //##############################################################################
+
+/* TODO RTC 144703
 bool isXBusEnabled( TARGETING::TargetHandle_t i_proc )
 {
     #define PRDF_FUNC "[PlatServices::isXBusEnabled] "
@@ -315,11 +322,13 @@ bool isXBusEnabled( TARGETING::TargetHandle_t i_proc )
 
     #undef PRDF_FUNC
 }
+*/
 
 //##############################################################################
 //##                        Memory specific functions
 //##############################################################################
 
+/* TODO RTC 136126
 // Helper function for the for several other memory functions.
 int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank,
                          ecmdDataBufferBase & o_startAddr,
@@ -389,9 +398,11 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, uint8_t i_mrank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t getBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
                         CenDqBitmap & o_bitmap, bool i_allowNoDimm )
 {
@@ -435,9 +446,11 @@ int32_t getBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
                         const CenDqBitmap & i_bitmap )
 {
@@ -471,9 +484,11 @@ int32_t setBadDqBitmap( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
                          CenMark & o_mark )
 {
@@ -535,9 +550,11 @@ int32_t mssGetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
                          CenMark & io_mark, bool & o_writeBlocked,
                          bool i_allowWriteBlocked )
@@ -545,6 +562,7 @@ int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
     #define PRDF_FUNC "[PlatServices::mssSetMarkStore] "
 
     int32_t o_rc = SUCCESS;
+
     errlHndl_t errl = NULL;
     o_writeBlocked = false;
 
@@ -591,9 +609,11 @@ int32_t mssSetMarkStore( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssGetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
                         CenSymbol & o_port0Spare, CenSymbol & o_port1Spare,
                         CenSymbol & o_eccSpare )
@@ -623,9 +643,11 @@ int32_t mssGetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
 
     return o_rc;
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssSetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
                         const CenSymbol & i_symbol, bool i_x4EccSpare )
 {
@@ -649,9 +671,11 @@ int32_t mssSetSteerMux( TargetHandle_t i_mba, const CenRank & i_rank,
 
     return o_rc;
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t getMemAddrRange( TargetHandle_t i_mba, CenAddr & o_startAddr,
                          CenAddr & o_endAddr )
 {
@@ -673,9 +697,11 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, CenAddr & o_startAddr,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t getMemAddrRange( TargetHandle_t i_mba, const CenRank & i_rank,
                          CenAddr & o_startAddr, CenAddr & o_endAddr,
                          bool i_slaveOnly )
@@ -702,9 +728,11 @@ int32_t getMemAddrRange( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC
 int32_t getDimmSpareConfig( TargetHandle_t i_mba, CenRank i_rank,
                             uint8_t i_ps, uint8_t & o_spareConfig )
 {
@@ -763,8 +791,11 @@ int32_t getDimmSpareConfig( TargetHandle_t i_mba, CenRank i_rank,
     return o_rc;
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
+
+/* TODO RTC
 errlHndl_t  getFapiDimmDqAttr( TargetHandle_t i_target,
                                uint8_t *io_dqMapPtr )
 {
@@ -785,9 +816,11 @@ errlHndl_t  getFapiDimmDqAttr( TargetHandle_t i_target,
 
     return(l_fapiElog);
 } // end function getFapiDimmDqAttr
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC
 int32_t getMemBufRawCardType( TargetHandle_t i_mba,
                               WiringType & o_cardType )
 {
@@ -937,11 +970,13 @@ int32_t getMemBufRawCardType( TargetHandle_t i_mba,
 
     #undef PRDF_FUNC
 }
+*/
 
 //##############################################################################
 //##                    Maintenance Command class wrapper
 //##############################################################################
 
+/* TODO RTC 136126
 mss_MaintCmdWrapper::mss_MaintCmdWrapper( mss_MaintCmd * i_maintCmd ) :
     iv_cmd(i_maintCmd)
 {}
@@ -1024,8 +1059,6 @@ int32_t mss_MaintCmdWrapper::cleanupCmd()
 
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
-
 // Helper function for the other createMssCmd() functions.
 mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
                                     TargetHandle_t i_mba, uint32_t i_stopCond,
@@ -1127,6 +1160,7 @@ mss_MaintCmdWrapper * createIncAddrMssCmd( TargetHandle_t i_mba )
 
     return o_cmd;
 }
+*/
 
 //------------------------------------------------------------------------------
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
index 8b07545b8..c8b19dc36 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -43,7 +43,9 @@
 #include <prdfTimer.H>
 #include <prdfParserEnums.H>
 
-#include <dimmConsts.H>         // for DIMM_DQ_RANK_BITMAP_SIZE
+//#include <dimmConsts.H>         // for DIMM_DQ_RANK_BITMAP_SIZE TODO RTC 136126
+
+/* TODO RTC 144699
 #include <fapiPlatHwpInvoker.H> // for fapi::fapiRcToErrl()
 
 #define PRD_FAPI_TO_ERRL(ERRHNDL, FUNC, _args_...) \
@@ -51,6 +53,9 @@
         fapi::ReturnCode l_rc = FUNC(_args_); \
         ERRHNDL = fapi::fapiRcToErrl(l_rc);   \
     }
+*/
+
+#include <errlentry.H>
 
 //------------------------------------------------------------------------------
 
@@ -90,7 +95,9 @@ void milliSleep( uint32_t i_seconds, uint32_t i_milliseconds );
  * @param   i_target  Any target
  * @return  Returns the corresponding FAPI target for a given target
  */
+/* TODO RTC 144700
 fapi::Target getFapiTarget( TARGETING::TargetHandle_t i_target );
+*/
 
 /**
  * @brief Check SMGR runtime state
@@ -128,8 +135,9 @@ bool isSpConfigFsp();
  * @brief capture SBE image failure Registers for FFDC
  * @param i_procTarget Processor target
  */
+/* TODO RTC 136050
 void collectSBE_FFDC(TARGETING::TargetHandle_t i_procTarget);
-
+*/
 
 //##############################################################################
 //##                       Lane Repair functions
@@ -141,15 +149,19 @@ void collectSBE_FFDC(TARGETING::TargetHandle_t i_procTarget);
  * @param   o_rxFailLanes Vector of failed lanes
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136120
 int32_t readErepair(TARGETING::TargetHandle_t i_rxBusTgt,
                     std::vector<uint8_t> &o_rxFailLanes);
+*/
 
 /**
  * @brief   Calls HWP to clear FIRs after a lane repair event
  * @param   i_rxBusTgt    Target of the receiving end of the bus
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136120
 int32_t clearIOFirs(TARGETING::TargetHandle_t i_rxBusTgt);
+*/
 
 /**
  * @brief   Calls HWP to power down failed lanes
@@ -158,9 +170,11 @@ int32_t clearIOFirs(TARGETING::TargetHandle_t i_rxBusTgt);
  * @param   i_txFailLanes Vector of  tx failed lanes
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136120
 int32_t powerDownLanes(TARGETING::TargetHandle_t i_rxBusTgt,
                        const std::vector<uint8_t> &i_rxFailLanes,
                        const std::vector<uint8_t> &i_txFailLanes);
+*/
 
 /**
  * @brief   Calls erepair accessor procedure get failed lanes from VPD
@@ -169,9 +183,11 @@ int32_t powerDownLanes(TARGETING::TargetHandle_t i_rxBusTgt,
  * @param   o_txFailLanes Vector of  tx failed lanes
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136120
 int32_t getVpdFailedLanes(TARGETING::TargetHandle_t i_rxBusTgt,
                           std::vector<uint8_t> &o_rxFailLanes,
                           std::vector<uint8_t> &o_txFailLanes);
+*/
 
 /**
  * @brief   Calls erepair prcd to set failed lanes in vpd and check threshold
@@ -181,10 +197,12 @@ int32_t getVpdFailedLanes(TARGETING::TargetHandle_t i_rxBusTgt,
  * @param   o_thrExceeded True if these failed lanes exceeded erepair threshold
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136120
 int32_t setVpdFailedLanes(TARGETING::TargetHandle_t i_rxBusTgt,
                           TARGETING::TargetHandle_t i_txBusTgt,
                           std::vector<uint8_t> &i_rxFailLanes,
                           bool & o_thrExceeded);
+*/
 
 /**
  * @brief   Calls io_fir_isolation HWP and commits FAPI errorlog containing
@@ -192,7 +210,9 @@ int32_t setVpdFailedLanes(TARGETING::TargetHandle_t i_rxBusTgt,
  * @param   i_rxBusTgt    Target of the receiving end of the bus
  * @return  SUCCESS
  */
+/* TODO RTC 136120
 int32_t erepairFirIsolation(TARGETING::TargetHandle_t i_rxBusTgt);
+*/
 
 //##############################################################################
 //##                        Memory specific functions
@@ -208,8 +228,10 @@ int32_t erepairFirIsolation(TARGETING::TargetHandle_t i_rxBusTgt);
  *                       possible ranks. Default is FALSE.
  * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
                         CenDqBitmap & o_bitmap, bool i_allowNoDimm = false );
+*/
 
 /**
  * @brief  Writes the bad DQ bitmap attribute for both ports of the target rank.
@@ -219,8 +241,10 @@ int32_t getBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
  * @note   This is a no-op if DRAM Repairs are disabled in manufacturing.
  * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t setBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
                         const CenDqBitmap & i_bitmap );
+*/
 
 /**
  * @brief  Invokes the get mark store hardware procedure.
@@ -229,8 +253,10 @@ int32_t setBadDqBitmap( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
  * @param  o_mark The returned mark.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssGetMarkStore( TARGETING::TargetHandle_t i_mba,
                          const CenRank & i_rank, CenMark & o_mark );
+*/
 
 /**
  * @brief  Invokes the set mark store hardware procedure.
@@ -252,10 +278,12 @@ int32_t mssGetMarkStore( TARGETING::TargetHandle_t i_mba,
  *         time, so do a RMW operation to avoid overwritting a previous mark.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssSetMarkStore( TARGETING::TargetHandle_t i_mba,
                          const CenRank & i_rank, CenMark & io_mark,
                          bool & o_writeBlocked,
                          bool i_allowWriteBlocked = false );
+*/
 
 /**
  * @brief  Invokes the get steer mux hardware procedure.
@@ -266,9 +294,11 @@ int32_t mssSetMarkStore( TARGETING::TargetHandle_t i_mba,
  * @param  o_eccSpare   A symbol associated with the ECC spare (x4 mode only).
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssGetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
                         CenSymbol & o_port0Spare, CenSymbol & o_port1Spare,
                         CenSymbol & o_eccSpare );
+*/
 
 /**
  * @brief  Invokes the set steer mux hardware procedure.
@@ -279,8 +309,10 @@ int32_t mssGetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
  * @note   The procedure will be able to derive the port from the given symbol.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssSetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
                         const CenSymbol & i_symbol, bool i_x4EccSpare );
+*/
 
 /**
  * @brief  Returns the start and end maintenance address of the given MBA.
@@ -289,8 +321,10 @@ int32_t mssSetSteerMux( TARGETING::TargetHandle_t i_mba, const CenRank & i_rank,
  * @param  o_endAddr   The return end address.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba, CenAddr & o_startAddr,
                          CenAddr & o_endAddr );
+*/
 
 /**
  * @brief  Returns the start and end maintenance address of the given rank. By
@@ -302,9 +336,11 @@ int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba, CenAddr & o_startAddr,
  * @param  i_slaveOnly true = slave rank only, false = master rank (default).
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t getMemAddrRange( TARGETING::TargetHandle_t i_mba,
                          const CenRank & i_rank, CenAddr & o_startAddr,
                          CenAddr & o_endAddr, bool i_slaveOnly = false );
+*/
 
 /**
  * @brief   Returns master core for the master proc
@@ -326,8 +362,10 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt );
  *          spare can be on High nibble or low nibble. This function will
  *          populate spare config information in o_spareConfig.
  */
+/* TODO RTC 136126
 int32_t getDimmSpareConfig( TARGETING::TargetHandle_t i_mba, CenRank i_rank,
                             uint8_t i_ps, uint8_t & o_spareConfig );
+*/
 
 /**
  * @brief  Returns the raw card type of a buffered DIMM.
@@ -336,8 +374,10 @@ int32_t getDimmSpareConfig( TARGETING::TargetHandle_t i_mba, CenRank i_rank,
  *                      the raw card type currently is not supported.
  * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t getMemBufRawCardType( TARGETING::TargetHandle_t i_mbaTarget,
                               CEN_SYMBOL::WiringType & o_wiringType );
+*/
 
 /**
  * @brief   get DIMM DQ map from FAPI routines
@@ -345,90 +385,92 @@ int32_t getMemBufRawCardType( TARGETING::TargetHandle_t i_mbaTarget,
  * @param   io_dqMapPtr   Pointer to area to receive DIMM DQ map (80 bytes)
  * @return  Non-Null if error log occurs
  */
+/* TODO RTC 136126
 errlHndl_t  getFapiDimmDqAttr( TARGETING::TargetHandle_t i_target,
                                uint8_t *io_dqMapPtr );
+*/
 
 //##############################################################################
 //##                    Maintenance Command class wrapper
 //##############################################################################
 
-/**
- * @brief This is a wrapper class for underlying maintenance class object
- *
- * By this class, we will hide underlying maintenance class dependency
- * from rest of code. All public function mss_MaintCmd used by prd should
- * be defined here also.
- */
-
-class mss_MaintCmdWrapper
-{
-  public: // data types
-
-    /** Represents underlying maintenance command object type **/
-    enum CmdType
-    {
-        TIMEBASE_SCRUB,
-        TIMEBASE_STEER_CLEANUP,
-        SUPERFAST_READ,
-    };
-
-    /** Input flags to control how, and on what, the command runs. **/
-    enum CtrlFlags
-    {
-        /** Run all defaults. See each individual flag of default behavior */
-        NO_FLAGS        = 0x00,
-
-        /** When set, the command will run from the beginning of the given rank
-         *  to the end of memory. Default is to run to the end of the rank. */
-        END_OF_MEMORY   = 0x01,
-
-        /** When set, the command will run on the slave rank only. Default is to
-         *  run on the entire master rank. */
-        SLAVE_RANK_ONLY = 0x04,
-    };
-
-  public: // functions
-
-    /**
-     * @brief Constructor
-     *
-     * @param i_maintCmd Underlying maintenance command object
-     */
-    mss_MaintCmdWrapper( mss_MaintCmd * i_maintCmd );
-
-    /**
-     * @brief Destructor
-     */
-    virtual ~mss_MaintCmdWrapper();
-
-    /**
-     * @brief  Stops running maint cmd, and saves the address it stopped at.
-     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
-     */
-    int32_t stopCmd();
-
-    /**
-     * @brief  Saves any settings that need to be restored when command is done.
-     *         Loads the setup parameters into the hardware. Starts the command,
-     *         then either polls for complete or exits with command running.
-     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
-     */
-     int32_t setupAndExecuteCmd();
-
-    /**
-     * @brief  Called once a command is done if we need to restore settings that
-     *         had to be modified to run a specific command type, or clear error
-     *         data in the hw that is no longer relevant.
-     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
-     */
-     int32_t cleanupCmd();
-
-  private: // instance variables
-
-    // Underlying maintenance command object pointer
-    mss_MaintCmd * iv_cmd;
-
-}; // class mss_MaintCmdWrapper
+// TODO: RTC 136126
+///**
+// * @brief This is a wrapper class for underlying maintenance class object
+// *
+// * By this class, we will hide underlying maintenance class dependency
+// * from rest of code. All public function mss_MaintCmd used by prd should
+// * be defined here also.
+// */
+//class mss_MaintCmdWrapper
+//{
+//  public: // data types
+//
+//    /** Represents underlying maintenance command object type **/
+//    enum CmdType
+//    {
+//        TIMEBASE_SCRUB,
+//        TIMEBASE_STEER_CLEANUP,
+//        SUPERFAST_READ,
+//    };
+//
+//    /** Input flags to control how, and on what, the command runs. **/
+//    enum CtrlFlags
+//    {
+//        /** Run all defaults. See each individual flag of default behavior */
+//        NO_FLAGS        = 0x00,
+//
+//        /** When set, the command will run from the beginning of the given rank
+//         *  to the end of memory. Default is to run to the end of the rank. */
+//        END_OF_MEMORY   = 0x01,
+//
+//        /** When set, the command will run on the slave rank only. Default is to
+//         *  run on the entire master rank. */
+//        SLAVE_RANK_ONLY = 0x04,
+//    };
+//
+//  public: // functions
+//
+//    /**
+//     * @brief Constructor
+//     *
+//     * @param i_maintCmd Underlying maintenance command object
+//     */
+//    mss_MaintCmdWrapper( mss_MaintCmd * i_maintCmd );
+//
+//    /**
+//     * @brief Destructor
+//     */
+//    virtual ~mss_MaintCmdWrapper();
+//
+//    /**
+//     * @brief  Stops running maint cmd, and saves the address it stopped at.
+//     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+//     */
+//    int32_t stopCmd();
+//
+//    /**
+//     * @brief  Saves any settings that need to be restored when command is done.
+//     *         Loads the setup parameters into the hardware. Starts the command,
+//     *         then either polls for complete or exits with command running.
+//     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+//     */
+//     int32_t setupAndExecuteCmd();
+//
+//    /**
+//     * @brief  Called once a command is done if we need to restore settings that
+//     *         had to be modified to run a specific command type, or clear error
+//     *         data in the hw that is no longer relevant.
+//     * @return Non-SUCCESS if an internal function fails, SUCCESS otherwise.
+//     */
+//     int32_t cleanupCmd();
+//
+//  private: // instance variables
+//
+//    // Underlying maintenance command object pointer
+//    mss_MaintCmd * iv_cmd;
+//
+//}; // class mss_MaintCmdWrapper
 
 /**
  * @brief  Create a maintenance command object.
@@ -448,6 +490,7 @@ class mss_MaintCmdWrapper
  *         that contains i_rank, but the target address range can be modified
  *         with i_flags and/or i_sAddrOverride.
  */
+/* TODO RTC 136126
 mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
                             TARGETING::TargetHandle_t i_mba,
                             const CenRank & i_rank, uint32_t i_stopCond,
@@ -455,6 +498,7 @@ mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
                                             = mss_MaintCmd::FAST_MAX_BW_IMPACT,
                             uint32_t i_flags = mss_MaintCmdWrapper::NO_FLAGS,
                             const CenAddr * i_sAddrOverride = NULL );
+*/
 
 /**
  * @brief  Create an IncrementAddress maintenance command object.
@@ -463,7 +507,9 @@ mss_MaintCmdWrapper * createMssCmd( mss_MaintCmdWrapper::CmdType i_cmdType,
  * @note   This function allocates memory on heap for mss_MaintCmdWrapper
  *         object. It is the caller's responsibilty to delete this object.
  */
+/* TODO RTC 136126
 mss_MaintCmdWrapper * createIncAddrMssCmd( TARGETING::TargetHandle_t i_mba );
+*/
 
 //##############################################################################
 //##                        util functions
@@ -477,9 +523,11 @@ mss_MaintCmdWrapper * createIncAddrMssCmd( TARGETING::TargetHandle_t i_mba );
  * @param   o_data   returned data
  * @return  Non-SUCCESS if an internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136052
 int32_t getCfam( ExtensibleChip * i_chip,
                  const uint32_t i_addr,
                  uint32_t & o_data);
+*/
 
 /**
  * @brief   get sysref clk target for the given proc target.
@@ -498,7 +546,9 @@ TARGETING::TargetHandle_t getActiveRefClk(
  * @param  i_proc a proc target
  * @return TRUE if ATTR_PROC_X_ENABLE is set, FALSE otherwise.
  */
+/* TODO RTC 144703
 bool isXBusEnabled(TARGETING::TargetHandle_t i_proc);
+*/
 
 } // end namespace PlatServices
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
index 03dbf6c7f..ffa0bfbbb 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -38,7 +38,7 @@
 #include <prdfErrlUtil.H>
 #include <prdfTrace.H>
 #include <algorithm>
-#include <fapi.H>
+//#include <fapi.H> TODO RTC 136126
 #include <targeting/common/targetservice.H>
 #include <targeting/common/utilFilter.H>
 
@@ -1344,11 +1344,13 @@ int32_t getDimmRowCol( TARGETING::TargetHandle_t i_mba, uint8_t & o_rowNum,
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 bool isDramWidthX4( TargetHandle_t i_mba )
 {
     return ( fapi::ENUM_ATTR_EFF_DRAM_WIDTH_X4 ==
              i_mba->getAttr<ATTR_EFF_DRAM_WIDTH>() );
 }
+*/
 
 //------------------------------------------------------------------------------
 
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 2c11bb55d..4d6cea7c6 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
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -123,34 +123,34 @@ prd_obj += prdfMfgThresholdMgr.o
 prd_obj += prdfLineDelete.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 += prdfFsiCapUtil.o
-prd_obj += prdfLaneRepair.o
-prd_obj += prdfMemoryMru.o
-prd_obj += prdfPegasusConfigurator.o
-prd_obj += prdfPhbUtils.o
-prd_obj += prdfPlatUtil.o
+#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 += prdfFsiCapUtil.o
+#prd_obj += prdfLaneRepair.o
+#prd_obj += prdfMemoryMru.o
+#prd_obj += prdfPegasusConfigurator.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
+#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/framework/config/prdfMbaDomain.C b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
index a53c83522..ca7eafc68 100644
--- a/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
+++ b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,7 +31,7 @@
 #include <prdfTrace.H>
 
 // Pegasus includes
-#include <prdfCenMbaDataBundle.H>
+//#include <prdfCenMbaDataBundle.H> TODO RTC 136126
 
 using namespace TARGETING;
 
@@ -48,6 +48,7 @@ int32_t MbaDomain::startScrub()
 
     do
     {
+/* TODO RTC 136126
         // Iterate all MBAs in the domain.
         for ( uint32_t i = 0; i < GetSize(); ++i )
         {
@@ -63,6 +64,7 @@ int32_t MbaDomain::startScrub()
                 o_rc = FAIL; continue; // Keep going.
             }
         }
+*/
 
     } while (0);
 
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 724b1a11c..ebebecbf2 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -38,13 +38,9 @@
 #include <prdfTrace.H>
 #include <prdfAssert.h>
 
-#include <prdfCenAddress.H>
-#include <prdfCenDqBitmap.H>
 #include <iipServiceDataCollector.h>
 #include <UtilHash.H>
 
-#include <diag/mdia/mdia.H>
-#include <diag/mdia/mdiamevent.H>
 #include <errno.h>
 #include <sys/time.h>
 #include <time.h>
@@ -115,10 +111,12 @@ bool isSpConfigFsp()
 //##                       Processor specific functions
 //##############################################################################
 
+/* TODO RTC 136050
 void collectSBE_FFDC(TARGETING::TargetHandle_t i_procTarget)
 {
     // Do nothing for Hostboot
 }
+*/
 
 //------------------------------------------------------------------------------
 
@@ -137,6 +135,7 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt )
 //##                        util functions
 //##############################################################################
 
+/* TODO RTC 136052
 int32_t getCfam( ExtensibleChip * i_chip,
                  const uint32_t i_addr,
                  uint32_t & o_data)
@@ -194,6 +193,7 @@ int32_t getCfam( ExtensibleChip * i_chip,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
index 55efa3742..aef0c8763 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -34,7 +34,7 @@
  * is common between FSP and Hostboot should be in the respective common file.
  */
 
-#include <utility_procedures/mss_maint_cmds.H>
+//#include <utility_procedures/mss_maint_cmds.H> TODO: RTC 136126
 
 // This must be included after all Hostboot specific includes. This will take
 // care of cases where a file must be included in the common code, but the
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
index d53d3711c..7e1d19604 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -37,7 +37,7 @@
 #include <prdfErrlUtil.H>
 #include <prdfTrace.H>
 
-#include <prdfCenDqBitmap.H>
+//#include <prdfCenDqBitmap.H> TODO RTC 136126
 
 #include <diag/mdia/mdia.H>
 #include <diag/mdia/mdiamevent.H>
@@ -120,6 +120,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget,
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssRestoreDramRepairs( TargetHandle_t i_mbaTarget,
                                uint8_t & o_repairedRankMask,
                                uint8_t & o_badDimmMask )
@@ -143,9 +144,11 @@ int32_t mssRestoreDramRepairs( TargetHandle_t i_mbaTarget,
 
     return o_rc;
 }
+*/
 
 //------------------------------------------------------------------------------
 
+/* TODO RTC 136126
 int32_t mssIplUeIsolation( TargetHandle_t i_mba, const CenRank & i_rank,
                            CenDqBitmap & o_bitmap )
 {
@@ -174,6 +177,7 @@ int32_t mssIplUeIsolation( TargetHandle_t i_mba, const CenRank & i_rank,
 
     #undef PRDF_FUNC
 }
+*/
 
 //------------------------------------------------------------------------------
 
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H
index 31d342198..d9c05237d 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -70,9 +70,11 @@ int32_t mdiaSendEventMsg( TARGETING::TargetHandle_t i_mbaTarget,
  * @param  o_badDimm An encoded bitmask of bad DIMMs.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssRestoreDramRepairs( TARGETING::TargetHandle_t i_mbaTarget,
                                uint8_t & o_repairedRankMask,
                                uint8_t & o_badDimmMask );
+*/
 
 /**
  * @brief  Invokes the mss_IPL_UE_isolation hardware procedure.
@@ -82,9 +84,11 @@ int32_t mssRestoreDramRepairs( TARGETING::TargetHandle_t i_mbaTarget,
  * @param  o_bitmap DQ bitmap container.
  * @return Non-SUCCESS in internal function fails, SUCCESS otherwise.
  */
+/* TODO RTC 136126
 int32_t mssIplUeIsolation( TARGETING::TargetHandle_t i_mba,
                            const CenRank & i_rank,
                            CenDqBitmap & o_bitmap );
+*/
 
 } // end namespace PlatServices
 
diff --git a/src/usr/diag/prdf/prdfMain_ipl.C b/src/usr/diag/prdf/prdfMain_ipl.C
index 2dbdcde41..415164aec 100644
--- a/src/usr/diag/prdf/prdfMain_ipl.C
+++ b/src/usr/diag/prdf/prdfMain_ipl.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -33,7 +33,7 @@
 
 #include <prdfMain.H>
 
-#include <prdfCenMbaDataBundle.H>
+//#include <prdfCenMbaDataBundle.H> TODO RTC 136128
 #include <prdfExtensibleChip.H>
 #include <prdfErrlUtil.H>
 #include <prdfPlatServices.H>
@@ -68,12 +68,14 @@ int32_t analyzeIplCEStats( TargetHandle_t i_mba, bool &o_calloutMade )
 {
     #define PRDF_FUNC "PRDF::analyzeIplCEStats"
 
+    int32_t o_rc = SUCCESS;
+
     PRDF_ENTER( PRDF_FUNC "(0x%08x)", getHuid(i_mba) );
 
+/* TODO RTC 136128
     // will unlock when going out of scope
     PRDF_SYSTEM_SCOPELOCK;
 
-    int32_t o_rc = SUCCESS;
     o_calloutMade = false;
 
     ExtensibleChip * mbaChip = (ExtensibleChip *)systemPtr->GetChip( i_mba );
@@ -105,6 +107,7 @@ int32_t analyzeIplCEStats( TargetHandle_t i_mba, bool &o_calloutMade )
         // Commit the error log
         ERRORLOG::errlCommit( errl, PRDF_COMP_ID );
     }
+*/
 
     PRDF_EXIT( PRDF_FUNC "(0x%08x), o_calloutMade:%u",
                getHuid(i_mba), o_calloutMade );
@@ -126,6 +129,7 @@ errlHndl_t startScrub()
     int32_t l_rc = SUCCESS;
     HUID nodeId = INVALID_HUID;
 
+/* TODO RTC 136126
     // will unlock when going out of scope
     PRDF_SYSTEM_SCOPELOCK;
 
@@ -165,6 +169,7 @@ errlHndl_t startScrub()
         PRDF_EXIT( PRDF_FUNC "HUID=0x%08x", nodeId );
 
     } while (0);
+*/
 
     if (( SUCCESS != l_rc ) && (NULL == o_errl))
     {
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index 231980a03..b4c44bd36 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2013,2015
+# Contributors Listed Below - COPYRIGHT 2013,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -58,14 +58,14 @@ prd_incpath += ${PRD_SRC_PATH}/plat/pegasus
 # External header paths
 prd_incpath += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 prd_incpath += ${ROOTPATH}/src/include/usr/errl
-prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/fapi
-prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/hwp
-prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/plat
+#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/fapi
+#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/hwp
+#prd_incpath += ${ROOTPATH}/src/include/usr/hwpf/plat
 prd_incpath += ${ROOTPATH}/src/include/usr/ibscom
 prd_incpath += ${ROOTPATH}/src/include/usr/util
-prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training
-prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/include
-prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete
+#prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training
+#prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/include
+#prd_incpath += ${ROOTPATH}/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete
 
 ################################################################################
 # Hostboot only object files common to both IPL and runtime
@@ -82,11 +82,11 @@ 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
+#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)
@@ -115,13 +115,13 @@ prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfReadPnorFirData.o)
 prd_obj += $(if $(CONFIG_ENABLE_CHECKSTOP_ANALYSIS), prdfWriteHomerFirData.o)
 
 # plat/pegasus/ (non-rule plugin related)
-prd_obj += prdfCenMbaIplCeStats.o
-prd_obj += prdfCenMbaTdCtlr_ipl.o
-prd_obj += prdfDramRepairs.o
-prd_obj += prdfPlatCalloutUtil.o
+#prd_obj += prdfCenMbaIplCeStats.o
+#prd_obj += prdfCenMbaTdCtlr_ipl.o
+#prd_obj += prdfDramRepairs.o
+#prd_obj += prdfPlatCalloutUtil.o
 
 # plat/pegasus/ (rule plugin related)
-prd_rule_plugin += prdfPlatCenMba_ipl.o
+#prd_rule_plugin += prdfPlatCenMba_ipl.o
 
 endif
 
@@ -135,9 +135,9 @@ ifeq (${HOSTBOOT_RUNTIME},1)
 prd_obj += prdfPlatServices_rt.o
 
 # common/runtime/
-prd_obj += prdfCenMbaDynMemDealloc_rt.o
-prd_obj += prdfCenMbaTdCtlr_rt.o
-prd_obj += prdfCenMbaTdRankData.o
+#prd_obj += prdfCenMbaDynMemDealloc_rt.o
+#prd_obj += prdfCenMbaTdCtlr_rt.o
+#prd_obj += prdfCenMbaTdRankData.o
 
 endif
 
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 d8fef5ffa..007201e74 100755
--- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk
+++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2015
+# Contributors Listed Below - COPYRIGHT 2012,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -53,9 +53,9 @@ EXTRAINCDIR += ${PRD_USR_PATH}/test
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/errl
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/util
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
+#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
+#EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 
 #------------------------------------------------------------------------------
 # objects