1 files changed, 24 insertions, 8 deletions
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index a6534be01..440e9562b 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -48,7 +48,8 @@ if ($hb_mode == 1) {
     }
 
 }else{
-    $hb_machine = "AXONE"
+    # simics now provides us the chip type (starting w/ p9a ) 
+    $hb_machine = $proc_chip_type
 }
 
 python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\""
@@ -98,9 +99,9 @@ if ($hb_mode == 1) {
         ($cc).seeprom3.seeprom3_image.set 0x3FED9 0x5A5A5A5A 8 -l
     }
 } else {
-    foreach $cc in (get-object-list proc_hb_standalone) {
-        ($cc).seeprom1_image.set 0x3FED9 0x5A5A5A5A 8 -l
-        ($cc).seeprom3_image.set 0x3FED9 0x5A5A5A5A 8 -l
+    foreach $proc in (get-all-procs) {
+        ($proc.get-seeprom 1).set 0x3FED9 0x5A5A5A5A 8 -l
+        ($proc.get-seeprom 3).set 0x3FED9 0x5A5A5A5A 8 -l
     }
 }
 
@@ -112,6 +113,7 @@ try {
     run-python-file (lookup-file hbfw/hb-simdebug.py)
 } except { echo "ERROR: Failed to load Hostboot debug tools (hb-simdebug.py)" }
 
+
 # Determine security state
 $hw_security=(shell "echo $SECURITY_HW_POLICY")
 if($hw_security == "") {
@@ -133,13 +135,27 @@ if($hw_security == "1") {
     $jumperApplied=FALSE
 }
 
-# Load jumper state to each processor
-foreach $procX in (get-object-list p9_proc) {
-
+if ($hb_machine == "p9a") {
     # Set logical jumper state in SIMICS based on HW policy
     #     "TRUE"=jumper applied(security disabled, default)
     #     "FALSE"=jumper removed(security enabled)
-    (($procX)->secure_jumper=$jumperApplied)
+
+    # Load jumper state to the master processor
+    $hb_masterproc.set-secure-jumper value = $jumperApplied
+
+    # Load jumper state to all slave processors
+    foreach $procS in ($hb_masterproc.get-slave-procs) {
+        $procS.set-secure-jumper value = $jumperApplied
+    }
+} else {
+  # Load jumper state to each processor
+  foreach $procX in (get-object-list p9_proc) {
+
+      # Set logical jumper state in SIMICS based on HW policy
+      #     "TRUE"=jumper applied(security disabled, default)
+      #     "FALSE"=jumper removed(security enabled)
+      (($procX)->secure_jumper=$jumperApplied)
+  }
 }
 
 if ($hb_mode == 0) {