Remove DJVPD and CVPD sections from axone pnor layout

Remove unneeded Centaur VPD and DIMM JEDEC VPD sections
to help reduce axone pnor memory space.
Hit a simics issue where sysmvpd.data.ecc size was
overwriting the first four 4-byte words of HBB, so
procmvpd_p9a.dat size was corrected to 64KB.
procmvpd_p9c.dat had same issue, but the overwrite
was being corrected by a following CVPD write.

Change-Id: I70eb12709be0ac7b73609fb080d956ee2faa39a2
RTC:207995
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75896
Reviewed-by: Glenn Miles <milesg@ibm.com>
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 18 insertions, 11 deletions

diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics
index 58821b2a2..39a382303 100755
--- a/src/build/simics/standalone.simics
+++ b/src/build/simics/standalone.simics
@@ -8,7 +8,7 @@
 if not defined hb_skip_vpd_preload {$hb_skip_vpd_preload = 0}
 
 
-if ($hb_mode == 0) {
+if ($hb_mode == 0) { # Axone and beyond
     # this number is no longer provided we have to look it up
     $num_dimms = (dec (list-length((get-master-procs)[0].get-dimms)))
 }
@@ -33,17 +33,24 @@ if ($hb_skip_vpd_preload == 0) {
             run-python-file (lookup-file hbfw/hb-pnor-vpd-preload.py)
             # Must match pnor layout used (see eyecatch in layout)
             echo "PNOR layout offset for VPD:"
-            # PNOR eyecatch MVPD
-            echo "    - MVPD at 0x79000"
-            ($hb_pnor).load-file ./sysmvpd.dat.ecc 0x79000
-            if ($hb_mode == 1){
-            # PNOR eyecatch DJVPD
-            echo "    - DJVPD at 0x31000"
-            ($hb_pnor).load-file ./sysspd.dat.ecc 0x31000
+
+            if ($hb_mode == 1) {  # Nimbus/Cumulus
+                # PNOR eyecatch MVPD
+                echo "    - MVPD at 0x79000"
+                ($hb_pnor).load-file ./sysmvpd.dat.ecc 0x79000
+
+                # PNOR eyecatch DJVPD
+                echo "    - DJVPD at 0x31000"
+                ($hb_pnor).load-file ./sysspd.dat.ecc 0x31000
+
+                # PNOR eyecatch CVPD
+                echo "    - CVPD at 0x109000"
+                ($hb_pnor).load-file ./sysmemvpd.dat.ecc 0x109000
+            } else {  # Axone and beyond
+                # PNOR eyecatch MVPD
+                echo "    - MVPD at 0x31000"
+                ($hb_pnor).load-file ./sysmvpd.dat.ecc 0x31000
             }
-            # PNOR eyecatch CVPD
-            echo "    - CVPD at 0x109000"
-            ($hb_pnor).load-file ./sysmemvpd.dat.ecc 0x109000
     } except { echo "ERROR: Failed to preload VPD into PNOR." }
 }