diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-04-15 17:45:53 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-05-09 07:19:10 -0500 |
| commit | 868e98cac34aed64ffb5f983a3662ae31af0c8a1 (patch) | |
| tree | 51eb73b4c371ec4e1347f6ff7423d4b32c576436 /src/build | |
| parent | f1207a134bea63fc08342effe5e806aa38cc26e6 (diff) | |
| download | talos-hostboot-868e98cac34aed64ffb5f983a3662ae31af0c8a1.tar.gz talos-hostboot-868e98cac34aed64ffb5f983a3662ae31af0c8a1.zip | |
Move mailbox area to leave more room for Sapphire.
Change-Id: If39241fbbc110400177b3ef3a5e895f5ed14f2a4
RTC: 81670
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10588
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@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')
| -rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 17 | ||||
| -rwxr-xr-x | src/build/debug/simics-debug-framework.py | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index 607724aef..cba04e3aa 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -33,3 +33,18 @@ #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo +echo "+++ Patching P8_MURANO.config for mailbox move." +mkdir -p $sb/simu/configs +grep -v "GFW_P8_HB_UNSECURE_OFFSET" \ + $BACKING_BUILD/src/simu/configs/P8_MURANO.config > \ + $sb/simu/configs/P8_MURANO.config +echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \ + $sb/simu/configs/P8_MURANO.config + +echo "+++ Patching P8_VENICE.config for mailbox move." +grep -v "GFW_P8_HB_UNSECURE_OFFSET" \ + $BACKING_BUILD/src/simu/configs/P8_VENICE.config > \ + $sb/simu/configs/P8_VENICE.config +echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \ + $sb/simu/configs/P8_VENICE.config + diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index 889d3bcfc..8489d56e5 100755 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -515,7 +515,7 @@ def magic_instruction_callback(user_arg, cpu, arg): mem_map_entries = (conf.system_cmp0.phys_mem).map for entry in mem_map_entries: #print ">> %d:%s" % (entry[0], entry[1]) - if entry[0] == (node_num*per_node): + if (entry[0] == (node_num*per_node)) or (entry[0] == hb_hrmor): mem_object = simics.SIM_object_name(entry[1]) #print "Found entry %s for hrmor %d" % (mem_object, hb_hrmor) break @@ -542,7 +542,7 @@ def magic_instruction_callback(user_arg, cpu, arg): tracbin[node_num],\ hb_tracBinaryBuffer,\ hb_tracBinaryBufferSz) - + cmd2 = "(shell \"(fsp-trace ./%s -s %s/hbotStringFile >> %s 2>/dev/null) || true\")"\ %(tracbin[node_num],\ |
