INITPROC: Hostboot - Updated HWPs from defect SW218634

SW218634

Change-Id: Ie328e419de7cf6228ac3068775a2ddc068972678
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5874
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C
index bcdacc19e..2b3a0a3cf 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_image_help_base.C,v 1.13 2013/06/10 22:09:49 jeshua Exp $
+// $Id: p8_image_help_base.C,v 1.14 2013-08-01 13:34:16 dcrowell Exp $
 /*------------------------------------------------------------------------------*/
 /* *! TITLE : p8_image_help_base.c                                              */
 /* *! DESCRIPTION : Basic helper functions for building and extracting          */
@@ -486,7 +486,8 @@ int over_write_ring_data_in_image(  void            *io_image,
   hostVectorThis = (void*) ( (uint64_t)hostVectorBase + 
                              i_idxVector*8*(1+i_overridable) +
                              8*i_override*i_overridable );
-  hostRingBlock = (DeltaRingLayout*)(*(uintptr_t*)hostVectorThis);
+  uint64_t tmp1 = (*(uintptr_t*)hostVectorThis);
+  sbe_xip_pore2host( io_image, tmp1, (void**)&hostRingBlock);
   hostRingData = (void*)( (uint64_t)hostRingBlock + hostRingBlock->entryOffset );
 
   // Over write ringData onto existing ring data content in image.
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api_fixed.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api_fixed.C
index 07cb97413..2f7d44778 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api_fixed.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api_fixed.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pore_table_gen_api_fixed.C,v 1.7 2013/05/08 20:16:18 cmolsen Exp $
+// $Id: p8_pore_table_gen_api_fixed.C,v 1.9 2013/05/29 18:58:28 cmolsen Exp $
 //
 /*------------------------------------------------------------------------------*/
 /* *! (C) Copyright International Business Machines Corp. 2012                  */
@@ -41,7 +41,6 @@
 /*------------------------------------------------------------------------------*/
 
 #define __P8_PORE_TABLE_GEN_API_C
-#include <HvPlicModule.H>
 #include <p8_pore_api_custom.h>
 #include <p8_pore_table_gen_api.H>
 #include <p8_delta_scan_rw.h>
@@ -566,14 +565,14 @@ uint32_t p8_pore_gen_scom_fixed(  void       *io_image,
   //   SCOM is replacing that NNNN sequence.
   hostScomEntryNext = hostScomTableThis;
   MY_DBG("hostScomEntryNext (addr): 0x%016llx\n ",(uint64_t)hostScomEntryNext);
-  while (memcmp(hostScomEntryNext, bufRET, sizeof(uint32_t))) {
+  while (memcmp(hostScomEntryNext, bufRET, sizeof(uint32_t)))  {
     entriesCount++;
     MY_DBG("Number of SCOM entries: %i\n ",entriesCount);
     if (*((uint32_t*)bufIIS+1)==*((uint32_t*)hostScomEntryNext+1) && entriesMatch==0)  {// +1 skips 1st word in Scom entry (which loads the PC in an LS operation.)
       hostScomEntryMatch = hostScomEntryNext;
       entriesMatch++;
     }
-    if ((0 == memcmp(hostScomEntryNext, bufNOP, sizeof(uint32_t))) && entriesNOP==0)  {
+    if (memcmp(hostScomEntryNext, bufNOP, sizeof(uint32_t))==0 && entriesNOP==0)  {
       hostScomEntryNOP = hostScomEntryNext;
       entriesNOP++;
     }