Update some HWP files that changed names

Some HWP files changed names, the prefix proc_ was replaced with p8_
There are no functional changes here.

Change-Id: I7fa6409d0457df6a67c4c56386c09566dddec338
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1895
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

20 files changed, 337 insertions, 439 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
index 8ec8837de..95662a7eb 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
@@ -63,7 +63,7 @@
 
 //  Uncomment these files as they become available:
 #include    "proc_slw_build/proc_slw_build.H"
-#include    "proc_set_pore_bar/proc_set_pore_bar.H"
+#include    "p8_set_pore_bar/p8_set_pore_bar.H"
 
 namespace   BUILD_WINKLE_IMAGES
 {
@@ -445,7 +445,7 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
 
         //  fetch image location and size, written by host_build_winkle above
 
-        //  Note that the "i_mem_bar" input to proc_set_pore_bar is the physical
+        //  Note that the "i_mem_bar" input to p8_set_pore_bar is the physical
         //  address of the PORE image, this is the image that will get executed
         //  at winkle.  The void * i_image parameter actually points to the same
         //  place in HostBoot; in fsp or cronus these will be different.
@@ -461,7 +461,7 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
         //  of 2.  So far our images are less than 1 meg so this is 1
         uint64_t l_mem_size =  1;
 
-        //  defined in proc_set_pore_bar.H
+        //  defined in p8_set_pore_bar.H
         uint32_t        l_mem_type  =   SLW_L3 ;
 
         // cast OUR type of target to a FAPI type of target.
@@ -473,7 +473,7 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
 
         //  call the HWP with each fapi::Target
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                   "Call proc_set_pore_bar, membar=0x%lx, size=0x%lx, mask=0x%lx, type=0x%x",
+                   "Call p8_set_pore_bar, membar=0x%lx, size=0x%lx, mask=0x%lx, type=0x%x",
                    l_imageAddr,
                    (l_cpu_target->getAttr<ATTR_SLW_IMAGE_SIZE>()),
                    l_mem_size,
@@ -483,7 +483,7 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
         void * const l_pImage = reinterpret_cast<void * const>(l_imageAddr);
 
         FAPI_INVOKE_HWP( l_errl,
-                         proc_set_pore_bar,
+                         p8_set_pore_bar,
                          l_fapi_cpu_target,
                          l_pImage,
                          l_imageAddr,
@@ -494,13 +494,13 @@ void    call_proc_set_pore_bar( void    *io_pArgs )
         if ( l_errl )
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR : proc_set_pore_bar, PLID=0x%x",
+                      "ERROR : p8_set_pore_bar, PLID=0x%x",
                       l_errl->plid()  );
         }
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                       "SUCCESS : proc_set_pore_bar" );
+                       "SUCCESS : p8_set_pore_bar" );
         }
 
     }   while ( 0 ); // end do block
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
index 263211193..52e562b51 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H
@@ -54,7 +54,7 @@
  *  @}
  *  @{
  *      @substepnum     2
- *      @substepname    proc_set_pore_bar
+ *      @substepname    p8_set_pore_bar
  *      @substepdesc    : Tell SLW Eng where winkle image is
  *          @target_sched   serial
  *  @}
diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile
index b8afa2c87..177b426f3 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/makefile
+++ b/src/usr/hwpf/hwp/build_winkle_images/makefile
@@ -41,8 +41,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images
 ##  EXAMPLE:
 ##  EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_slw_build
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_gen_cpureg
 
 CUSTOMFLAGS+= -D __FAPI
@@ -56,15 +56,15 @@ OBJS =  build_winkle_images.o   \
         pore_inline_assembler.o \
         proc_slw_build.o        \
         sbe_xip_image.o         \
-        proc_set_pore_bar.o     \
-        proc_pba_bar_config.o
+        p8_set_pore_bar.o       \
+        p8_pba_bar_config.o
 
 ##  NOTE: add a new directory onto the vpaths when you add a new HWP
 ##  EXAMPLE:
 #   VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
 VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_slw_build
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config
 VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_gen_cpureg
 
 ##  Point to the PORE image in PNOR
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.C b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.C
index c12affb58..de42e5e61 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.C $ */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.C $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -20,9 +20,8 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-
-// $Id: proc_pba_bar_config.C,v 1.8 2012/08/13 13:04:20 stillgs Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_pba_bar_config.C,v $
+// $Id: p8_pba_bar_config.C,v 1.2 2012/09/25 20:18:50 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pba_bar_config.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
@@ -30,50 +29,50 @@
 //------------------------------------------------------------------------------
 // *! OWNER NAME: Klaus P. Gungl         Email: kgungl@de.ibm.com
 // *!
-// *!
-/// \file proc_pba_bar_config.C
+// *! 
+/// \file p8_pba_bar_config.C
 /// \brief Initialize PAB and PAB_MSK of PBA
-// *!
+// *!        
 // *! The purpose of this procedure is to set the PBA BAR, PBA BAR Mask and PBA scope value / registers
-// *!
-// *! Following proposals here: pass values for one set of pbabar, pass reference to structure for one set of pbabar, pass struct of struct containing
-// *! all setup values
-// *!
+// *! 
+// *! Following proposals here: pass values for one set of pbabar, pass reference to structure for one set of pbabar, pass struct of struct containing  
+// *! all setup values  
+// *!   
 // *! High-level procedure flow:
 // *!   parameter checking
 // *!   set PBA_BAR
 // *!   set PBA_BARMSK
-// *!
+// *!  
 // *! Procedure Prereq:
 // *!   o System clocks are running
 // *!
 // *! list of changes
 // *! 2011/11/22 all variables / passing calling parameters are uint64_t, cmd_scope is enum, MASK is not bitmask parameter but size
-// *!            structure for init contain uint64_t only.
+// *!            structure for init contain uint64_t only.       
 // *!
 //------------------------------------------------------------------------------
 
-
+    
 // ----------------------------------------------------------------------
 // Includes
 // ----------------------------------------------------------------------
 #include <fapi.H>
 #include "p8_scom_addresses.H"
-#include "proc_pba_init.H"
-#include "proc_pba_bar_config.H"
+#include "p8_pba_init.H"
+#include "p8_pba_bar_config.H"
 #include "pba_firmware_register.H"
-#include "proc_pm.H"
+#include "p8_pm.H"
 
 
 extern "C" {
 
 
-using namespace fapi;
+using namespace fapi;  
 
-// ----------------------------------------------------------------------
+// ---------------------------------------------------------------------- 
 // Constant definitions
 // ----------------------------------------------------------------------
-
+                              
 // for range checking            0x0123456701234567
 #define BAR_ADDR_RANGECHECK_     0x0003FFFFFFF00000ull
 #define BAR_ADDR_RANGECHECK_HIGH 0xFFFC000000000000ull
@@ -90,53 +89,53 @@ using namespace fapi;
 // Prototypes
 // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
+// ---------------------------------------------------------------------- 
 // Function definitions
 // ----------------------------------------------------------------------
 
 uint64_t PowerOf2Roundedup (uint64_t value);
 
 
-// --------------------------------------------- proc_pba_bar_config ----
-// function:
+// --------------------------------------------- p8_pba_bar_config ----
+// function: 
 // initialize initialize a specific set of PBA_BAR (=cmd_scope and address), PBA_BARMSK (mask/size)
 // pass values directly
 //! init_pba_bar_ps
 //! initialize a set of  PBA_BAR and PBA_BARMSK registers, calling parameters: reference to structure of initialization values
 /*!
-@param i_target the target
+@param i_target the target 
 @param i_index specifies which set of BAR / BARMSK registers to set. [0..3]
 @param i_pba_bar_addr PBA base address - 1MB grandularity
-@param i_pba_bar_size PBA region size in MB;  if not a power of two value,
-        the value will be rounded up to the next power of 2 for setting the
+@param i_pba_bar_size PBA region size in MB;  if not a power of two value, 
+        the value will be rounded up to the next power of 2 for setting the 
         hardware mask
 @param i_pba_cmd_scope command scope according to pba spec
-*/
-
-fapi::ReturnCode
-proc_pba_bar_config (const Target&  i_target,
-                             uint32_t       i_index,
-                             uint64_t       i_pba_bar_addr,
-                             uint64_t       i_pba_bar_size,
-                             uint64_t       i_pba_cmd_scope
+*/ 
+
+fapi::ReturnCode 
+p8_pba_bar_config (const Target&  i_target,
+		             uint32_t       i_index, 
+		             uint64_t       i_pba_bar_addr,
+		             uint64_t       i_pba_bar_size,
+		             uint64_t       i_pba_cmd_scope 
                      )
 {
 
 
-    ecmdDataBufferBase  data(64);
+    ecmdDataBufferBase  data(64); 
     fapi::ReturnCode    l_rc;
     uint32_t            l_ecmdRc = 0;
-
-    pba_barn_t          bar;
+    
+    pba_barn_t          bar;  
     pba_barmskn_t       barmask;
-
+    
     uint64_t            work_size;
 
-    FAPI_DBG("Called with index %x, address 0x%16llX, size 0x%16llX scope 0x%16llX",
+    FAPI_DBG("Called with index %x, address 0x%16llX, size 0x%16llX scope 0x%16llX", 
                         i_index, i_pba_bar_addr, i_pba_bar_size, i_pba_cmd_scope);
 
     // check if pba_bar scope in range
-    if ( i_pba_cmd_scope > PBA_CMD_SCOPE_FOREIGN1 )
+    if ( i_pba_cmd_scope > PBA_CMD_SCOPE_FOREIGN1 ) 
     {
         FAPI_ERR("ERROR: PB Command Scope out of Range");
         FAPI_SET_HWP_ERROR(l_rc, RC_PROC_PBA_BAR_SCOPE_OUT_OF_RANGE);
@@ -145,19 +144,19 @@ proc_pba_bar_config (const Target&  i_target,
 
     // check if pba_addr amd pba_size are within range, high order bits checked, not low order!
     // this means if we need a check for "is this value on the correct boundary value => needs to be implemented
-    if ( (BAR_ADDR_RANGECHECK_HIGH & i_pba_bar_addr) != 0x0ull)
+    if ( (BAR_ADDR_RANGECHECK_HIGH & i_pba_bar_addr) != 0x0ull) 
     {
         FAPI_ERR("ERROR: Address out of Range");
         FAPI_SET_HWP_ERROR(l_rc, RC_PROC_PBA_ADDR_OUT_OF_RANGE);
         return l_rc;
-    }
-    if ( (i_pba_bar_size) == 0x0ull)
+    } 
+    if ( (i_pba_bar_size) == 0x0ull) 
     {
         FAPI_ERR("ERROR: Size must be 1MB or greater");
         FAPI_SET_HWP_ERROR(l_rc, RC_PROC_PBA_BAR_MASK_OUT_OF_RANGE);  // \todo change xml!!!
         return l_rc;
-    }
-
+    } 
+    
     // The PBA Mask indicates which bits from 23:43 (1MB grandularity) are
     // enabled to be passed from the OCI addresses.  Inverting this mask
     // indicates which address bits are going to come from the PBA BAR value.
@@ -194,94 +193,94 @@ proc_pba_bar_config (const Target&  i_target,
     //    FAPI_SET_HWP_ERROR(rc, RC_PROCPM_POREBAR_IMAGE_ADDR_ERROR);
     //    return rc;
     //}
-
-
-
-    // put the parameters into the correct fields
+    
+    
+    
+    // put the parameters into the correct fields 
     bar.value=0;
     bar.fields.cmd_scope = i_pba_cmd_scope;
     bar.fields.addr = i_pba_bar_addr >> 20;
-
-    FAPI_DBG("bar.fields   address  0x%16llX, scope  0x%16llX",
+    
+    FAPI_DBG("bar.fields   address  0x%16llX, scope  0x%16llX", 
                         bar.fields.addr, bar.fields.cmd_scope);
     FAPI_DBG("bar.value             0x%16llX", bar.value);
-
+    
      // Write the BAR
     l_ecmdRc |= data.setDoubleWord(0, bar.value);
-    if (l_ecmdRc)
+    if (l_ecmdRc) 
     {
        FAPI_ERR("Error (0x%x) setting up ecmdDataBufferBase", l_ecmdRc);
        l_rc.setEcmdError(l_ecmdRc);
        return l_rc;
     }
-
+    
     FAPI_DBG("  PBA_BAR%x:  %16llX", i_index,  data.getDoubleWord(0));
     l_rc = fapiPutScom(i_target, PBA_BARs[i_index], data);
-    if(l_rc)
-    {
+    if(l_rc) 
+    { 
         FAPI_ERR("PBA_BAR Putscom failed");
         return l_rc;
     }
-
+  
     // Compute and write the mask based on passed region size.
-
-    // If the size is already a power of 2, then set the mask to that value - 1.
+    
+    // If the size is already a power of 2, then set the mask to that value - 1. 
     // If the is not a power of 2, then set the mask the rounded up power of 2
     // value minus 1.
-
+    
     work_size = PowerOf2Roundedup(i_pba_bar_size);
-    FAPI_DBG("  i_pba_bar_size %16llu work_size:  %16llu", i_pba_bar_size, work_size);
-
-    barmask.value=0;
+    FAPI_DBG("  i_pba_bar_size %16llu work_size:  %16llu", i_pba_bar_size, work_size);   
+    
+    barmask.value=0;   
     barmask.fields.mask = work_size-1;
-
+    
     FAPI_DBG("bar.fields   mask  0x%16llX", barmask.fields.mask);
-
-
+   
+    
     // Write the MASK
-
+     
     // The size is tranlated to a mask by:
     //  Shifting the s
     //
     //
     //
-
+    
     l_ecmdRc |= data.setDoubleWord(0, barmask.value);
-    if (l_ecmdRc)
+    if (l_ecmdRc) 
     {
        FAPI_ERR("Error (0x%x) setting up ecmdDataBufferBase", l_ecmdRc);
        l_rc.setEcmdError(l_ecmdRc);
        return l_rc;
     }
-
+     
     FAPI_DBG("  PBA_BARMSK%x:  %16llu", i_index,  data.getDoubleWord(0));
     l_rc = fapiPutScom(i_target, PBA_BARMSKs[i_index], data);
-    if(l_rc)
-    {
+    if(l_rc) 
+    { 
       FAPI_ERR("PBA_MASK Putscom failed");
       return l_rc;
     }
 
     return l_rc;
-}
+}  
 
 ///-----------------------------------------------------------------------------
 /// Determine if a number is a power of two or not
-///-----------------------------------------------------------------------------
+///----------------------------------------------------------------------------- 
 bool
 isPowerOfTwo(uint64_t value)
 {
-    // if value ANDed with the value-1 is 0, then value is a power of 2.
+    // if value ANDed with the value-1 is 0, then value is a power of 2. 
     // if value is 0, this is considered not a power of 2 and will return false.
-
+   
     return !(value & (value - 1));
-
-}
-
-///-----------------------------------------------------------------------------
-/// Round up to next higher power of 2 (return value if it's already a power of
+   
+} 
+ 
+///----------------------------------------------------------------------------- 
+/// Round up to next higher power of 2 (return value if it's already a power of 
 /// 2).
-///-----------------------------------------------------------------------------
+///----------------------------------------------------------------------------- 
 uint64_t
 PowerOf2Roundedup (uint64_t value)
 {
@@ -296,6 +295,6 @@ PowerOf2Roundedup (uint64_t value)
     return value+1;
 }
 
-
+ 
 } //end extern C
 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.H b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.H
index 39185ad1f..69999c759 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config.H $ */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config.H $ */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
@@ -20,9 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-
-// $Id: proc_pba_bar_config.H,v 1.7 2012/09/12 21:54:12 wenning Exp $
-
+// $Id: p8_pba_bar_config.H,v 1.1 2012/09/25 20:18:52 stillgs Exp $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
@@ -31,27 +29,27 @@
 // *! OWNER NAME: Klaus P. Gungl         Email: kgungl@de.ibm.com
 // *!
 // *! General Description:
-// *!
-// *! include file for proc_pba_bar_config
+// *!        
+// *! include file for p8_pba_bar_config 
 // *!
 //------------------------------------------------------------------------------
-//
+// 
 
 
 // function pointer typedef definition for HWP call support
-typedef fapi::ReturnCode (*proc_pba_bar_config_FP_t) (const fapi::Target&,
-                                                            uint32_t,
-                                                            uint64_t,
-                                                            uint64_t,
+typedef fapi::ReturnCode (*p8_pba_bar_config_FP_t) (const fapi::Target&, 
+                                                            uint32_t, 
+                                                            uint64_t, 
+                                                            uint64_t, 
                                                             uint64_t);
 
-extern "C"
-{
+extern "C" 
+{				
 
-fapi::ReturnCode
-proc_pba_bar_config (const fapi::Target&    i_target,
-                             uint32_t               index,
-                             uint64_t               pba_bar_addr,
-                             uint64_t               pba_bar_size,
-                             uint64_t               pba_cmd_scope);
+fapi::ReturnCode 
+p8_pba_bar_config   (const fapi::Target&    i_target, 
+		             uint32_t               index, 
+		             uint64_t               pba_bar_addr,
+		             uint64_t               pba_bar_size,
+		             uint64_t               pba_cmd_scope);
 }
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config_errors.xml
index 78710b135..c150e1c26 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config_errors.xml
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config_errors.xml
@@ -1,7 +1,7 @@
 <!-- IBM_PROLOG_BEGIN_TAG                                                   -->
 <!-- This is an automatically generated prolog.                             -->
 <!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config_errors.xml $ -->
+<!-- $Source: src/usr/hwpf/hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config_errors.xml $ -->
 <!--                                                                        -->
 <!-- IBM CONFIDENTIAL                                                       -->
 <!--                                                                        -->
@@ -20,8 +20,7 @@
 <!-- Origin: 30                                                             -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-
-<!-- $Id: proc_pba_bar_config_errors.xml,v 1.4 2012/09/12 21:59:26 wenning Exp $ -->
+<!-- $Id: p8_pba_bar_config_errors.xml,v 1.1 2012/09/27 09:20:45 pchatnah Exp $ -->
 <!-- Error definitions for proc_pba_bar_config procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_init.H b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pba_init.H
index 7cbffb392..7019b2cc4 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_init.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pba_init.H
@@ -1,26 +1,25 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_init.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pba_init.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 
 
 //------------------------------------------------------------------------------
@@ -42,7 +41,7 @@
 
 #include "p8_scom_addresses.H"
 
-typedef fapi::ReturnCode (*proc_pba_init_FP_t) (const fapi::Target& , uint64_t );
+typedef fapi::ReturnCode (*p8_pba_init_FP_t) (const fapi::Target& , uint64_t );
 
 // constant definitions for valid command scope. LIMIT is used by setup routine for plausibility checking.
 
@@ -195,7 +194,7 @@ extern "C"
 {
 
 fapi::ReturnCode 
-proc_pba_init (const fapi::Target& i_target, 
+p8_pba_init (const fapi::Target& i_target, 
                      uint64_t mode
               );
 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pm.H b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pm.H
new file mode 100644
index 000000000..ed6ac1b42
--- /dev/null
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pm.H
@@ -0,0 +1,73 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pm.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: p8_pm.H,v 1.1 2012/08/23 04:58:58 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pm.H,v $
+//------------------------------------------------------------------------------
+// *|
+// *! (C) Copyright International Business Machines Corp. 2011
+// *! All Rights Reserved -- Property of IBM
+// *! *** IBM Confidential ***
+// *|
+// *! TITLE       : p8_pm.H
+// *! DESCRIPTION : Common header for Power Manangement procedures
+// *!
+// *! OWNER NAME  : Greg Still    Email: stillgs@us.ibm.com
+// *! BACKUP NAME : Jim Yacynych  Email: jimyac@us.ibm.com
+// *!
+//------------------------------------------------------------------------------
+
+#ifndef _P8_PM_H_
+#define _P8_PM_H_
+
+//------------------------------------------------------------------------------
+// Includes
+//------------------------------------------------------------------------------
+
+#include <fapi.H>
+
+#include "p8_scom_addresses.H"
+
+
+extern "C" {
+
+//------------------------------------------------------------------------------
+// Constant definitions
+//------------------------------------------------------------------------------
+
+
+#ifndef _P8_PM_FLOW_MODE
+#define _P8_PM_FLOW_MODE
+enum p8_PM_FLOW_MODE {
+        PM_CONFIG     = 0x1,
+        PM_RESET      = 0x2,
+        PM_INIT       = 0x3,
+        PM_SETUP      = 0x4,
+        PM_SETUP_PIB  = 0x5,
+        PM_SETUP_ALL  = 0x6
+        };
+#endif  // _P8_PM_FLOW_MODE
+
+
+} // extern "C"
+
+#endif // _P8_PM_H_
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.C b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.C
index aca990fcb..03b6e795a 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.C
@@ -1,28 +1,27 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.C $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
-// $Id: proc_set_pore_bar.C,v 1.8 2012/08/13 13:04:28 stillgs Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_set_pore_bar.C,v $
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.C $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: p8_set_pore_bar.C,v 1.1 2012/08/23 04:58:48 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_set_pore_bar.C,v $
 //-------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
@@ -30,7 +29,7 @@
 //-------------------------------------------------------------------------------
 // *! OWNER NAME: Greg Still         Email: stillgs@us.ibm.com
 // *!
-/// \file proc_set_pore_bar.C
+/// \file p8_set_pore_bar.C
 /// \brief Set up the Sleep/Winkle (SLW) PORE Memory Relocation (MRR) and
 /// Table Base Address (TBA) for accessing the SLW image
 ///
@@ -63,7 +62,7 @@
 ///     Calculate MRR address (32:63) = image address - link address (32 bit)
 ///     Store MRR to PORE SLW
 ///
-///     Call proc_pba_bar_config to set up PBA BAR 2 with the address and
+///     Call p8_pba_bar_config to set up PBA BAR 2 with the address and
 ///         size of the SLW region as passed via calling parameters
 ///         i_mem_bar and i_mem_mask.
 ///
@@ -80,10 +79,10 @@
 #include <fapi.H>
 #include "p8_scom_addresses.H"
 #include "pgp_common.h"
-#include "proc_set_pore_bar.H"
-#include "proc_pm.H"
-#include "proc_pba_init.H"
-#include "proc_pba_bar_config.H"
+#include "p8_set_pore_bar.H"
+#include "p8_pm.H"
+#include "p8_pba_init.H"
+#include "p8_pba_bar_config.H"
 #include "pba_firmware_register.H"
 #include "pgp_pba.h"
 #include "sbe_xip_image.h"
@@ -125,7 +124,7 @@ fapi::ReturnCode pba_slave_reset(   const fapi::Target& i_target,
 ///                         rounded up to the next power of 2 for setting the 
 ///                         hardware mask
 /// \param[in] i_mem_type   Defines where the SLW image was loaded.  See
-///                         proc_set_pore_bar.H enum for valid values.
+///                         p8_set_pore_bar.H enum for valid values.
 ///
 /// \retval SUCCESS
 /// \retval RC_PROCPM_POREBAR_IMAGE_BRANCH_VALUE_ERROR
@@ -134,7 +133,7 @@ fapi::ReturnCode pba_slave_reset(   const fapi::Target& i_target,
 /// \retval RC_PROCPM_POREBAR_IMAGE_PLACEMENT_ERROR (future version)
 
 fapi::ReturnCode
-proc_set_pore_bar(      const fapi::Target& i_target,
+p8_set_pore_bar(      const fapi::Target& i_target,
                         void                *i_image,
                         uint64_t            i_mem_bar,
                         uint64_t            i_mem_size,
@@ -167,7 +166,7 @@ proc_set_pore_bar(      const fapi::Target& i_target,
 
     // -----------------------------------------------------------------
 
-    FAPI_INF("Executing proc_set_pore_bar...");
+    FAPI_INF("Executing p8_set_pore_bar...");
     image_address = (uint64_t) i_image;
     FAPI_DBG("Passed address 0x%16llX ", image_address);
 
@@ -411,7 +410,7 @@ proc_set_pore_bar(      const fapi::Target& i_target,
                     pba_bar, i_mem_bar, i_mem_size);
 
     // Set the PBA BAR for the SLW region
-    FAPI_EXEC_HWP(rc, proc_pba_bar_config, i_target,
+    FAPI_EXEC_HWP(rc, p8_pba_bar_config, i_target,
                                            pba_bar,
                                            i_mem_bar,
                                            i_mem_size,
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.H b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.H
index 897a150ac..c9795820a 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.H
@@ -1,35 +1,34 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
-// $Id: proc_set_pore_bar.H,v 1.4 2012/08/13 13:04:30 stillgs Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_set_pore_bar.H,v $
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: p8_set_pore_bar.H,v 1.1 2012/08/23 04:58:53 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_set_pore_bar.H,v $
 //------------------------------------------------------------------------------
 // *|
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
 // *! *** IBM Confidential ***
 // *|
-// *! TITLE       : proc_set_pore_bar.H
+// *! TITLE       : p8_set_pore_bar.H
 // *! DESCRIPTION : Establish the BAR setup for the SLW image in the PBA as
 // *!               well as setting up the SLW engine with table base address
 // *!               and memory relocation regs in the SLW
@@ -48,7 +47,7 @@
 
 
 // function pointer typedef definition for HWP call support
-typedef fapi::ReturnCode (*proc_set_pore_bar_FP_t) (const fapi::Target&, 
+typedef fapi::ReturnCode (*p8_set_pore_bar_FP_t) (const fapi::Target&, 
                                                     void*, 
                                                     uint64_t,
                                                     uint64_t,
@@ -110,10 +109,10 @@ enum PORE__BA_SLAVE {
 ///                         rounded up to the next power of 2 for setting the 
 ///                         hardware mask
 /// \param[in] i_mem_type   Defines where the SLW image was loaded.  See
-///                         proc_set_pore_bar.H enum for valid values.
+///                         p8_set_pore_bar.H enum for valid values.
 
 fapi::ReturnCode 
-proc_set_pore_bar(  const fapi::Target& i_target, 
+p8_set_pore_bar(  const fapi::Target& i_target, 
                     void *i_image, 
                     uint64_t i_mem_bar, 
                     uint64_t i_mem_size, 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml
new file mode 100644
index 000000000..14bcf0fc6
--- /dev/null
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml
@@ -0,0 +1,61 @@
+<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
+<!-- This is an automatically generated prolog.                             -->
+<!--                                                                        -->
+<!-- $Source: src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml $ -->
+<!--                                                                        -->
+<!-- IBM CONFIDENTIAL                                                       -->
+<!--                                                                        -->
+<!-- COPYRIGHT International Business Machines Corp. 2012                   -->
+<!--                                                                        -->
+<!-- p1                                                                     -->
+<!--                                                                        -->
+<!-- Object Code Only (OCO) source materials                                -->
+<!-- Licensed Internal Code Source Materials                                -->
+<!-- IBM HostBoot Licensed Internal Code                                    -->
+<!--                                                                        -->
+<!-- The source code for this program is not published or otherwise         -->
+<!-- divested of its trade secrets, irrespective of what has been           -->
+<!-- deposited with the U.S. Copyright Office.                              -->
+<!--                                                                        -->
+<!-- Origin: 30                                                             -->
+<!--                                                                        -->
+<!-- IBM_PROLOG_END_TAG                                                     -->
+<!-- Error definitions for p8_set_pore_bar procedure -->
+<hwpErrors>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_IMAGE_BRANCH_VALUE_ERROR</rc>
+    <description>XIP access of branch table failed in p8_set_pore_bar</description>
+  </hwpError>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_LOC_ERROR</rc>
+    <description>Invalid image location passed to p8_set_pore_bar</description>
+  </hwpError>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_PBABAR_ERROR</rc>
+    <description>PBA BAR image location passed to p8_set_pore_bar</description>
+  </hwpError>
+    <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_PBA_SLVRST_TIMED_OUT</rc>
+    <description>PBA Slave Reset timed out in p8_set_pore_bar</description>
+  </hwpError>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_IMAGE_SIZE_ERROR</rc>
+    <description>XIP access to size value failed in p8_set_pore_bar</description>
+    <description>Image address plus image size overflows PBA region in p8_set_pore_bar</description>
+  </hwpError>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_IMAGE_PLACEMENT_ERROR</rc>
+    <description>Image address plus image size overflows PBA region in p8_set_pore_bar</description>
+  </hwpError>
+  <!-- *********************************************************************** -->
+  <hwpError>
+    <rc>RC_PROCPM_POREBAR_IMAGE_ADDR_ERROR</rc>
+    <description>Image address not in PBA BAR region in p8_set_pore_bar</description>
+  </hwpError>
+</hwpErrors>
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pba_firmware_register.H b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pba_firmware_register.H
index 8529b3194..8529b3194 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pba_firmware_register.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pba_firmware_register.H
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pba_firmware_registers.h b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pba_firmware_registers.h
index be6f860b7..be6f860b7 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pba_firmware_registers.h
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pba_firmware_registers.h
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pgp_common.h b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pgp_common.h
index 2fb33877a..2fb33877a 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pgp_common.h
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pgp_common.h
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pgp_pba.h b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pgp_pba.h
index 20b59ce62..20b59ce62 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/pgp_pba.h
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/pgp_pba.h
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/sbe_xip_image.h b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/sbe_xip_image.h
index 7a83c2aea..7a83c2aea 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/sbe_xip_image.h
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/sbe_xip_image.h
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_slave_config.H b/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_slave_config.H
deleted file mode 100644
index 1cda73385..000000000
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_slave_config.H
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pba_slave_config.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
-
-
-//------------------------------------------------------------------------------
-// *! (C) Copyright International Business Machines Corp. 2011
-// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
-//------------------------------------------------------------------------------
-// *! OWNER NAME: Klaus P. Gungl         Email: kgungl@de.ibm.com
-// *!
-// *! General Description:
-// *!        
-// *! include file for proc_pba_slave_config 
-// *!
-//------------------------------------------------------------------------------
-// 
-
-
-// function pointer typedef definition for HWP call support
-typedef fapi::ReturnCode (*proc_pba_slave_config_FP_t) (const fapi::Target&, int, int, uint64_t);
-
-
-extern "C" 
-{
-
-
-
-typedef struct {
-    unsigned  enable:1;
-    unsigned  mid_match_value:2;
-    unsigned  Reserved1:1;
-    unsigned  mid_care_mask:3;
-    unsigned  write_ttype:3;
-    unsigned  Reserved2: 1;
-    unsigned  read_ttype:1;
-    unsigned  read_prefetch_ctl:2;
-    unsigned  buf_invalidate_ctl:8;
-    unsigned  buf_alloc_w:1;
-    unsigned  buf_alloc_a:1;
-    unsigned  buf_alloc_b:1;
-    unsigned  buf_alloc_c:1;
-    unsigned  Reserved3:1;
-    unsigned  dis_write_gather:1;
-    unsigned  wr_gather_timeout:3;
-    unsigned  write_tsize: 7;
-    unsigned  extaddr: 14;
-    unsigned  Reserved4: 2;
-    unsigned  Reserved5: 13;
-} pba_slvctl_reg_type;
-
-typedef union {
-  pba_slvctl_reg_type fields;
-  uint64_t value;
-} slvcntl_reg_type;
-
-
-
-  // ReturnCode proc_pba_slave_config (Target i_target, 
-  // 				proc_mode_type proc_mode, 
-  // 				int index, 
-  // 		     		struct_pba_bar_msk_scope_init_type* ps_pba_init
-  // 				// pba_slvctl_type pba_slvctl_init
-  // 				);
-
-fapi::ReturnCode 
-proc_pba_slave_config (const fapi::Target& i_target, 
-                       int proc_mode, 
-		               int index, 
-		               uint64_t pba_slvctl_init);
-}
-
-
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pm.H b/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pm.H
deleted file mode 100644
index c65fb50a7..000000000
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pm.H
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_pm.H $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  p1
- *
- *  Object Code Only (OCO) source materials
- *  Licensed Internal Code Source Materials
- *  IBM HostBoot Licensed Internal Code
- *
- *  The source code for this program is not published or other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
-// $Id: proc_pm.H,v 1.4 2012/05/22 14:05:53 jimyac Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_pm.H,v $
-//------------------------------------------------------------------------------
-// *|
-// *! (C) Copyright International Business Machines Corp. 2011
-// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
-// *|
-// *! TITLE       : proc_pm.H
-// *! DESCRIPTION : Common header for Power Manangement procedures
-// *!
-// *! OWNER NAME  : Greg Still    Email: stillgs@us.ibm.com
-// *! BACKUP NAME : Jim Yacynych  Email: jimyac@us.ibm.com
-// *!
-//------------------------------------------------------------------------------
-
-#ifndef _PROC_PM_H_
-#define _PROC_PM_H_
-
-//------------------------------------------------------------------------------
-// Includes
-//------------------------------------------------------------------------------
-
-#include <fapi.H>
-
-#include "p8_scom_addresses.H"
-
-
-extern "C" {
-
-//------------------------------------------------------------------------------
-// Constant definitions
-//------------------------------------------------------------------------------
-
-
-#ifndef _PROC_PM_FLOW_MODE
-#define _PROC_PM_FLOW_MODE
-enum PROC_PM_FLOW_MODE {
-        PM_CONFIG     = 0x1,
-        PM_RESET      = 0x2,
-        PM_INIT       = 0x3,
-        PM_SETUP      = 0x4,
-        PM_SETUP_PIB  = 0x5,
-        PM_SETUP_ALL  = 0x6
-        };
-#endif  // _PROC_PM_FLOW_MODE
-
-
-} // extern "C"
-
-#endif // _PROC_PM_H_
diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml
deleted file mode 100644
index e660bdd85..000000000
--- a/src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--  IBM_PROLOG_BEGIN_TAG
-     This is an automatically generated prolog.
-   
-     $Source: src/usr/hwpf/hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml $
-   
-     IBM CONFIDENTIAL
-   
-     COPYRIGHT International Business Machines Corp. 2012
-   
-     p1
-   
-     Object Code Only (OCO) source materials
-     Licensed Internal Code Source Materials
-     IBM HostBoot Licensed Internal Code
-   
-     The source code for this program is not published or other-
-     wise divested of its trade secrets, irrespective of what has
-     been deposited with the U.S. Copyright Office.
-   
-     Origin: 30
-   
-     IBM_PROLOG_END_TAG -->
-<!-- Error definitions for proc_set_pore_bar procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_IMAGE_BRANCH_VALUE_ERROR</rc>
-    <description>XIP access of branch table failed in proc_set_pore_bar</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_LOC_ERROR</rc>
-    <description>Invalid image location passed to proc_set_pore_bar</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_PBABAR_ERROR</rc>
-    <description>PBA BAR image location passed to proc_set_pore_bar</description>
-  </hwpError>
-    <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PBA_SLVRST_TIMED_OUT</rc>
-    <description>PBA Slave Reset timed out in proc_set_pore_bar</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_IMAGE_SIZE_ERROR</rc>
-    <description>XIP access to size value failed in proc_set_pore_bar</description>
-    <description>Image address plus image size overflows PBA region in proc_set_pore_bar</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_IMAGE_PLACEMENT_ERROR</rc>
-    <description>Image address plus image size overflows PBA region in proc_set_pore_bar</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_POREBAR_IMAGE_ADDR_ERROR</rc>
-    <description>Image address not in PBA BAR region in proc_set_pore_bar</description>
-  </hwpError>
-</hwpErrors>
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index 013fc3ab8..a80bfb541 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -42,8 +42,8 @@ HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml   \
     ../pore/fapiporeve/fapiPoreVe_errors.xml \
     hwp/dram_initialization/proc_setup_bars/proc_setup_bars_errors.xml  \
     hwp/dram_initialization/proc_setup_bars/proc_fab_smp_errors.xml     \
-    hwp/build_winkle_images/proc_set_pore_bar/proc_set_pore_bar_errors.xml  \
-    hwp/build_winkle_images/proc_pba_bar_config/proc_pba_bar_config_errors.xml \
+    hwp/build_winkle_images/p8_set_pore_bar/p8_set_pore_bar_errors.xml  \
+    hwp/build_winkle_images/p8_pba_bar_config/p8_pba_bar_config_errors.xml \
     hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit_errors.xml \
     hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup_errors.xml \
     hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle_errors.xml \