Support Brazos Simics model names in debug tools

Quick fix to support the new object names in the Brazos Simics
model.  There are more changes required to support multinode
(see RTC: 61853) but this should work for single node bringup.

Change-Id: If0c591a2ae7c6665dcf76aa4a2e5a904455da4dd
RTC: 68898
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3955
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/build/simics/combined.simics b/src/build/simics/combined.simics
index 28c1b022f..0c234e1b8 100755
--- a/src/build/simics/combined.simics
+++ b/src/build/simics/combined.simics
@@ -1,3 +1,7 @@
+# Note : Assumes these vars were setup in startup.simics
+# $hb_masterproc : name of master proc chip object
+# $hb_pnor : name of pnor object associated with master proc
+
 #If running in Hostboot Developer Environment, copies patched base 
 #and extended hostboot images onto the FSP so HWSV will load 
 #pached versions to PNOR instead of the default images 
@@ -25,12 +29,12 @@ try {
 # Only needed in combined configs to enable FSP communication.  Hostboot
 # PNOR DD covers hostboot access.  Remove with RTC: 51500
 try {
-    fpga0.sfc_master->state_three_bytes=0
+    ($hb_pnor).sfc_master->state_three_bytes=0
 } except { echo "ERROR: Failed to run 4-byte PNOR address workaround in combined.simics." }
 
 # Manually set HB location till HWSV RTC 48188 is done
 try {
-    p8Proc0.proc_lbus_map.write 0x28e8 0xFFEF0000
+    ($hb_masterproc).proc_lbus_map.write 0x28e8 0xFFEF0000
 } except { echo "ERROR: Failed to set HB MMIO location workaround in combined.simics." }