diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2015-12-10 09:56:11 -0600 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 15:30:29 -0600 |
| commit | 38fb2f757c35568df4a969def6bedf6c0a23aa64 (patch) | |
| tree | ccb2c9779dff568a004096e90c0125d876981e15 /src/build/simics | |
| parent | 1a9c13876ad46dddd6c70ae631e836107b68146a (diff) | |
| download | blackbird-hostboot-38fb2f757c35568df4a969def6bedf6c0a23aa64.tar.gz blackbird-hostboot-38fb2f757c35568df4a969def6bedf6c0a23aa64.zip | |
Move bbuild to latest working version
Change-Id: Ieb27525599f6109b823724ef73e7d28cb1d6cf37
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22641
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build/simics')
| -rwxr-xr-x | src/build/simics/hb-pnor-vpd-preload.py | 2 | ||||
| -rwxr-xr-x | src/build/simics/startup.simics | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/build/simics/hb-pnor-vpd-preload.py b/src/build/simics/hb-pnor-vpd-preload.py index b16bfff22..c11d795e6 100755 --- a/src/build/simics/hb-pnor-vpd-preload.py +++ b/src/build/simics/hb-pnor-vpd-preload.py @@ -31,7 +31,7 @@ import shlex #------------------------------------------------------------------------------ toolLoc = os.environ.get("HB_TOOLPATH"); thisSys = os.environ.get("HB_MACHINE").upper(); -numProcs = os.environ.get( "GFW_P9_%s_NUM_PROCS" % thisSys ); +numProcs = os.environ.get( "NUM_PROCS"); #@TODO RTC 128112 numCentaurPerProc = "0"; # os.environ.get( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys ); cmd = toolLoc + "/hb-pnor-vpd-preload.pl --numProcs " + numProcs + " --numCentPerProc " + numCentaurPerProc + " --machine " + thisSys + " --dataPath " + toolLoc diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics index 19429d536..9beeaf231 100755 --- a/src/build/simics/startup.simics +++ b/src/build/simics/startup.simics @@ -3,9 +3,7 @@ $hb_startup_path = (lookup-file hbfw/startup.simics) $hb_script_location = (python "''.join(map('/'.__add__,\""+$hb_startup_path+"\"[1:].split('/')[0:-1]))") python "os.environ['HB_TOOLPATH'] = \""+$hb_script_location+"\"" -$hb_machine = (shell "env | grep 'GFW_P9_.*_PROC_EC' | sed 's/GFW_P9_\\(.*\\)_PROC_EC.*/\\1/'") -$hb_machine = (python "\""+$hb_machine+"\".lower()") -python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\"" +python "os.environ['HB_MACHINE'] = os.environ['MACHINE']" # Setup some common vars to use across machine types |
