diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2015-12-15 09:02:04 -0600 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-02-19 15:31:31 -0600 |
| commit | 2710b54b7b465364408c1267be9e35061a26251d (patch) | |
| tree | b9785d5471448d280168a1f4875ec8c8f5be374c /src | |
| parent | e4f790655d18010867a4059952fc39f0d5781d07 (diff) | |
| download | talos-hostboot-2710b54b7b465364408c1267be9e35061a26251d.tar.gz talos-hostboot-2710b54b7b465364408c1267be9e35061a26251d.zip | |
Include HRMOR in PTCR setting
Change-Id: Ifb217c0171678f77e5bcaaf6fc76adcceefbbf93
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22791
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 3 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 2 | ||||
| -rw-r--r-- | src/kernel/vmmmgr.C | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 2a2d70113..feebdc90f 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips910/Builds/b1218a_1550.910 +/esw/fips910/Builds/b1229a_1550.910 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 2ee042e5a..1b3e3c573 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2015 +# Contributors Listed Below - COPYRIGHT 2011,2016 # [+] International Business Machines Corp. # # @@ -40,7 +40,6 @@ cp -f $sb/../simics/targets/p9_nimbus/p9_nimbus.simics $sb/../simics/targets/p9_ cp -f $sb/../simics/targets/p9_nimbus/p9_nimbus_nolink.simics $sb/../simics/targets/p9_nimbus/p9_nimbus.simics chmod 666 $sb/../simics/targets/p9_nimbus/p9_nimbus.simics sed -i '/$image_name =/c\$image_name = "nimbus.pnor"' $sb/../simics/targets/p9_nimbus/p9_nimbus.simics -echo '$proc[0].setup-hostboot-script hb_script = "hbfw/standalone.simics"' >> $sb/../simics/targets/p9_nimbus/p9_nimbus.simics echo "+++ Patching simicsInfo NIMBUS flash definitions" mkdir -p $sb/simu/data diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index 5a17cf6cd..2ddbef73b 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2015 +# Contributors Listed Below - COPYRIGHT 2011,2016 # [+] International Business Machines Corp. # # diff --git a/src/kernel/vmmmgr.C b/src/kernel/vmmmgr.C index 8a55f56c7..fa9eea381 100644 --- a/src/kernel/vmmmgr.C +++ b/src/kernel/vmmmgr.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2010,2015 */ +/* Contributors Listed Below - COPYRIGHT 2010,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -132,7 +132,7 @@ void VmmManager::initPartitionTable() // Init the PTCR reg // PATB, PATS = 0 (4k table) - setPTCR( reinterpret_cast<uint64_t>(g_patb) ); + setPTCR( reinterpret_cast<uint64_t>(g_patb) + getHRMOR() ); } void VmmManager::initSDR1() |
