From a950157bfa82be76566ba9a81783592f42f727c9 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Thu, 15 Aug 2019 16:55:15 -0500 Subject: [PATCH] Update sim scripts to use $proc_chip_type to lookup chip for Axone Update the simics scripts to use variables provided by simics Change-Id: I5c01760630911d723286fcb1450a78e7e44c56a1 RTC: 204842 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82306 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Corey V Swenson Reviewed-by: Roland Veloz Reviewed-by: Daniel M Crowell --- src/build/simics/standalone.simics | 3 +-- src/build/simics/startup.simics | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics index e04fdae7fe0..5d795f96b6a 100755 --- a/src/build/simics/standalone.simics +++ b/src/build/simics/standalone.simics @@ -24,8 +24,7 @@ if ($hb_skip_vpd_preload == 0) { $procChipType=(get-object-list p9_proc)[0]->chip_type python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$procChipType+"\"" } else { - $procChipType=($hb_masterproc)->chip_type - python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$procChipType+"\"" + python "os.environ['HB_PROC_CHIP_TYPE'] = \""+$proc_chip_type+"\"" } diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics index 5f2a2135206..b638ab7c61c 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+"\"" @@ -134,7 +135,7 @@ if($hw_security == "1") { $jumperApplied=FALSE } -if ($hb_machine == "AXONE") { +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)