diff options
| author | Bill Hoffa <wghoffa@us.ibm.com> | 2017-01-10 08:57:38 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-01-10 13:51:21 -0500 |
| commit | dfad3c9a73492326c2b29908fbaed42917182f03 (patch) | |
| tree | fc6d2a811a8e24dca71db8f50eaac6e0bb2e0296 /src/usr | |
| parent | d6b88a8338f42b7bde2ccc4c8a798827ac99bf79 (diff) | |
| download | talos-hostboot-dfad3c9a73492326c2b29908fbaed42917182f03.tar.gz talos-hostboot-dfad3c9a73492326c2b29908fbaed42917182f03.zip | |
Tweak meaning of START_OCC_DURING_BOOT
- Instead of forcing to start when set, query payload type
and when off, never start
- Update bbuild to recent build
- Remove sim workarounds due to old level
- Add simics debug hack to workaround mambo hrmor sim bug
Change-Id: Ic1aa35c60b4ccd7679c0f3b08bd3b180b7b289c6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34545
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/isteps/HBconfig | 2 | ||||
| -rw-r--r-- | src/usr/isteps/istep21/call_host_runtime_setup.C | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/isteps/HBconfig b/src/usr/isteps/HBconfig index ce6573a2e..7f6468287 100644 --- a/src/usr/isteps/HBconfig +++ b/src/usr/isteps/HBconfig @@ -10,7 +10,7 @@ config SET_NOMINAL_PSTATE Set the PState to Nominal just before starting the payload. config START_OCC_DURING_BOOT - default y + default n help Activates all the OCCs during IPL diff --git a/src/usr/isteps/istep21/call_host_runtime_setup.C b/src/usr/isteps/istep21/call_host_runtime_setup.C index 46fcd78e0..50219a9cc 100644 --- a/src/usr/isteps/istep21/call_host_runtime_setup.C +++ b/src/usr/isteps/istep21/call_host_runtime_setup.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -146,9 +146,9 @@ void* call_host_runtime_setup (void *io_pArgs) } // end if phyp load #ifdef CONFIG_START_OCC_DURING_BOOT - bool l_activatePM = true; -#else bool l_activatePM = !(TARGETING::is_phyp_load()); +#else + bool l_activatePM = false; #endif if(l_activatePM) |
