diff options
| author | Zane Shelley <zshelle@us.ibm.com> | 2017-05-30 16:47:28 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-08 14:15:16 -0400 |
| commit | b431a6f3eb470edfe3b52eb7b980f97e0a587950 (patch) | |
| tree | 11013b26bc86c6390c96b0b261d99bdfcea517ef /src/usr/isteps | |
| parent | e1cfd4e624d95b6a6e8c96926848a633e10b21f4 (diff) | |
| download | talos-hostboot-b431a6f3eb470edfe3b52eb7b980f97e0a587950.tar.gz talos-hostboot-b431a6f3eb470edfe3b52eb7b980f97e0a587950.zip | |
fixed compilation errors when ENABLE_CHECKSTOP_ANALYSIS is enabled
Change-Id: Ic77f03ca0b4c221eef37581e6791ab8b4398af74
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41180
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps')
| -rw-r--r-- | src/usr/isteps/istep06/host_gard.C | 3 | ||||
| -rw-r--r-- | src/usr/isteps/istep16/call_host_activate_slave_cores.C | 8 | ||||
| -rw-r--r-- | src/usr/isteps/pm/pm_common.C | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/usr/isteps/istep06/host_gard.C b/src/usr/isteps/istep06/host_gard.C index f8dc30f1b..7bbaa7d64 100644 --- a/src/usr/isteps/istep06/host_gard.C +++ b/src/usr/isteps/istep06/host_gard.C @@ -58,9 +58,6 @@ #endif #ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS - #include <hwpf/hwp/occ/occ.H> - #include <hwpf/hwp/occ/occ_common.H> - #include <diag/attn/attn.H> #endif diff --git a/src/usr/isteps/istep16/call_host_activate_slave_cores.C b/src/usr/isteps/istep16/call_host_activate_slave_cores.C index 7cb56d536..87e925b53 100644 --- a/src/usr/isteps/istep16/call_host_activate_slave_cores.C +++ b/src/usr/isteps/istep16/call_host_activate_slave_cores.C @@ -45,6 +45,10 @@ #include <p9_cpu_special_wakeup.H> #include <p9_dump_stop_info.H> +#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS + #include <isteps/pm/occCheckstop.H> +#endif + using namespace ERRORLOG; using namespace TARGETING; using namespace ISTEP; @@ -132,7 +136,7 @@ void* call_host_activate_slave_cores (void *io_pArgs) fapi2::toString( l_fapi2ProcTarget, l_targName, sizeof(l_targName) ); - + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Call p9_dump_stop_info on processor %s", l_targName ); @@ -229,7 +233,7 @@ void* call_host_activate_slave_cores (void *io_pArgs) } // @@@@@ END CUSTOM BLOCK: @@@@@ -#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS +#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS if( l_stepError.isNull() ) { // update firdata inputs for OCC diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C index 5b0c9372d..8a2346e1e 100644 --- a/src/usr/isteps/pm/pm_common.C +++ b/src/usr/isteps/pm/pm_common.C @@ -193,12 +193,10 @@ namespace HBPM { l_config_data->firMaster = IS_FIR_MASTER; - // TODO: RTC 124683 The ability to write the HOMER data - // is currently not available at runtime. -#ifndef __HOSTBOOT_RUNTIME + #if !defined(__HOSTBOOT_RUNTIME) || defined(CONFIG_HBRT_PRD) l_errl = PRDF::writeHomerFirData( l_config_data->firdataConfig, - sizeof(config_data->firdataConfig) ); -#endif + sizeof(l_config_data->firdataConfig) ); + #endif } else |
