Add sha512perEC to SBEC and version to WINK

Change-Id: I2e5dadc3b8b8280d8eaa5e7662e9ecbc4dda5d88
RTC: 96020
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9211
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
index d1952bc65..84bd69b7d 100644
--- a/src/usr/sbe/sbe_update.C
+++ b/src/usr/sbe/sbe_update.C
@@ -445,10 +445,10 @@ namespace SBE
                 break;
             }
 
-
             // Get SBE PNOR section info from PNOR RP
             err = PNOR::getSectionInfo( pnorSectionId,
                                         pnorInfo );
+
             if(err)
             {
                 TRACFCOMP( g_trac_sbe, ERR_MRK"findSBEInPnor: Error calling "
@@ -584,11 +584,16 @@ namespace SBE
                 break;
             }
 
-            // The SBE Image for the corresponding EC was found and includes a
-            //  SBE Header, so advance PNOR pointer 4k to move it past header
-            //  page to the start of the non-customized SBE image
-            o_imgPtr = reinterpret_cast<void*>
+            //  The SBE Image for the corresponding EC was found, check if
+            //  it includes a SBE Header
+            if (pnorInfo.sha512perEC)
+            {
+                TRACFCOMP(g_trac_sbe,INFO_MRK"findSBEInPnor: sha512perEC Found in %s", pnorInfo.name);
+                // Advance PNOR pointer 4k to move it past header page to the
+                // start of the non-customized SBE image
+                o_imgPtr = reinterpret_cast<void*>
                                 (reinterpret_cast<char*>(hdr_Ptr)+0x1000);
+            }
 
 
             if(NULL != o_version)