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>

3 files changed, 18 insertions, 10 deletions

diff --git a/src/build/buildpnor/buildpnor.pl b/src/build/buildpnor/buildpnor.pl
index 0f89bc2c5..6b2ed6727 100755
--- a/src/build/buildpnor/buildpnor.pl
+++ b/src/build/buildpnor/buildpnor.pl
@@ -241,6 +241,7 @@ sub loadPnorLayout
         my $testonly = $sectionEl->{testonly}[0];
         my $ecc = (exists $sectionEl->{ecc} ? "yes" : "no");
         my $sha512Version = (exists $sectionEl->{sha512Version} ? "yes" : "no");
+        my $sha512perEC = (exists $sectionEl->{sha512perEC} ? "yes" : "no");
 
         if (($emitTestSections == 0) && ($sectionEl->{testonly}[0] eq "yes"))
         {
@@ -261,6 +262,7 @@ sub loadPnorLayout
         $$i_pnorLayoutRef{sections}{$physicalOffset}{side} = $side;
         $$i_pnorLayoutRef{sections}{$physicalOffset}{ecc} = $ecc;
         $$i_pnorLayoutRef{sections}{$physicalOffset}{sha512Version} = $sha512Version;
+        $$i_pnorLayoutRef{sections}{$physicalOffset}{sha512perEC} = $sha512perEC;
 
     }
 
@@ -364,7 +366,7 @@ sub createPnorImage
             my $chip = 0;
             my $compress = 0;
             my $ecc = 0;
-            my $sha512Version = 0;
+            my $version = 0;
 
             if( ($sectionHash{$key}{ecc} eq "yes") )
             {
@@ -372,7 +374,11 @@ sub createPnorImage
             }
             if( ($sectionHash{$key}{sha512Version} eq "yes") )
             {
-                $sha512Version = 0x80;
+                $version = 0x80;
+            }
+            elsif( ($sectionHash{$key}{sha512perEC} eq "yes") )
+            {
+                $version = 0x40;
             }
 
             #First User Data Word
@@ -382,8 +388,8 @@ sub createPnorImage
               | $ecc;
 
             #Second User Data Word
-            #[1:sha512Version]
-            my $userflags1 = ($sha512Version << 24);
+            #[1:sha512Version/sha512perEC]
+            my $userflags1 = ($version << 24);
 
             trace(1,"userflags0 = $userflags0");
             trace(1,"userflags1 = $userflags1");
diff --git a/src/build/buildpnor/defaultPnorLayout.xml b/src/build/buildpnor/defaultPnorLayout.xml
index 4fcc42a51..972471d61 100644
--- a/src/build/buildpnor/defaultPnorLayout.xml
+++ b/src/build/buildpnor/defaultPnorLayout.xml
@@ -117,6 +117,7 @@ Layout Description
         <eyeCatch>SBEC</eyeCatch>
         <physicalOffset>0x83D000</physicalOffset>
         <physicalRegionSize>0x90000</physicalRegionSize>
+        <sha512perEC/>
         <ecc/>
     </section>
     <section>
@@ -132,6 +133,7 @@ Layout Description
         <eyeCatch>WINK</eyeCatch>
         <physicalOffset>0x915000</physicalOffset>
         <physicalRegionSize>0x120000</physicalRegionSize>
+        <sha512Version/>
         <ecc/>
     </section>
     <section>
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index a680cf4cf..63c940d5f 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -233,12 +233,12 @@ MURANO_TARG_IMG = simics_MURANO_targeting.bin
 VENICE_TARG_IMG = simics_VENICE_targeting.bin
 MURANO_TARG_IMG_ECC = simics_MURANO_targeting.bin.ecc
 VENICE_TARG_IMG_ECC = simics_VENICE_targeting.bin.ecc
-MURANO_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.bin}
-VENICE_SLW_IMG = ${ENGD_OBJPATH:Fp8.ref_image.bin}
-MURANO_LOCAL_SLW_IMG = s1.ref_image.bin
-VENICE_LOCAL_SLW_IMG = p8.ref_image.bin
-MURANO_LOCAL_SLW_IMG_ECC = s1.ref_image.bin.ecc
-VENICE_LOCAL_SLW_IMG_ECC = p8.ref_image.bin.ecc
+MURANO_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.hdr.bin}
+VENICE_SLW_IMG = ${ENGD_OBJPATH:Fp8.ref_image.hdr.bin}
+MURANO_LOCAL_SLW_IMG = s1.ref_image.hdr.bin
+VENICE_LOCAL_SLW_IMG = p8.ref_image.hdr.bin
+MURANO_LOCAL_SLW_IMG_ECC = s1.ref_image.hdr.bin.ecc
+VENICE_LOCAL_SLW_IMG_ECC = p8.ref_image.hdr.bin.ecc
 MURANO_SBE_IMG = s1SbePartition.bin
 VENICE_SBE_IMG = p8SbePartition.bin
 MURANO_SBE_IMG_ECC = s1SbePartition.bin.ecc