Update axone pnor layout to move eecache to the begining

Because we rely on having a stable offset for the EECACHE section
of pnor we will move it to the start of the pnor layout. This will
make it less likely to move around as now we are auto-adjusting
offsets if sections like HBI happen to exceed to allotted space.

Change-Id: I4463c9d1cfb6ba86c777c976f911b14be5a483e3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83791
Reviewed-by: Zachary Clark <zach@ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>

2 files changed, 11 insertions, 9 deletions

diff --git a/src/build/buildpnor/pnorLayoutAxone.xml b/src/build/buildpnor/pnorLayoutAxone.xml
index 2f1d02fc1..a4f3bf4e2 100644
--- a/src/build/buildpnor/pnorLayoutAxone.xml
+++ b/src/build/buildpnor/pnorLayoutAxone.xml
@@ -86,6 +86,16 @@ Layout Description
         <ecc/>
     </section>
     <section>
+        <!-- NOTE must be before images that are likely to change like HBI,
+        also mustupdate standalone.simics if EECACHE offset changes-->
+        <description>Eeprom Cache(512K)</description>
+        <eyeCatch>EECACHE</eyeCatch>
+        <physicalOffset>0x2C000</physicalOffset>
+        <physicalRegionSize>0x80000</physicalRegionSize>
+        <side>sideless</side>
+        <ecc/>
+    </section>
+    <section>
         <description>Guard Data (20K)</description>
         <eyeCatch>GUARD</eyeCatch>
         <physicalRegionSize>0x5000</physicalRegionSize>
@@ -251,12 +261,4 @@ Layout Description
         <sha512Version/>
         <ecc/>
     </section>
-    <section>
-        <!-- NOTE must update standalone.simics if EECACHE offset changes-->
-        <description>Eeprom Cache(512K)</description>
-        <eyeCatch>EECACHE</eyeCatch>
-        <physicalRegionSize>0x80000</physicalRegionSize>
-        <side>sideless</side>
-        <ecc/>
-    </section>
 </pnor>
diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics
index 4432424bc..dbd5cc920 100755
--- a/src/build/simics/standalone.simics
+++ b/src/build/simics/standalone.simics
@@ -57,7 +57,7 @@ if ($hb_mode == 0) {
     $eccPreload = (lookup-file "%simics%/eecache_prebuilt.bin.ecc")
     # NOTE must change offset if PNOR layout changes EECACHE offsets
     echo "    - Loading prebuilt EECACHE "+$eccPreload+" at 0x3D80000 in PNOR"
-    ($hb_pnor).load-file $eccPreload 0x3D80000
+    ($hb_pnor).load-file $eccPreload 0x2C000
 }