diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2017-01-05 11:51:20 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-12 11:38:23 -0500 |
| commit | 8f6e6c4e220d3128c0969b93a6f176b3820e3325 (patch) | |
| tree | df95fff36935b90f033f6f70522222e869ad78b9 /src/usr/runtime | |
| parent | 8a969e59cfa5543ccb963287cd2efc551b534b28 (diff) | |
| download | talos-hostboot-8f6e6c4e220d3128c0969b93a6f176b3820e3325.tar.gz talos-hostboot-8f6e6c4e220d3128c0969b93a6f176b3820e3325.zip | |
Updates to always use HDAT for OPAL
Change-Id: Ie60155466afc0fdf8dc87eca36eae458339f64a1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34433
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
| -rw-r--r-- | src/usr/runtime/hdatservice.C | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/usr/runtime/hdatservice.C b/src/usr/runtime/hdatservice.C index 205c6e006..a8d7f36d1 100644 --- a/src/usr/runtime/hdatservice.C +++ b/src/usr/runtime/hdatservice.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -492,10 +492,9 @@ errlHndl_t hdatService::loadHostData(void) payload_kind = TARGETING::PAYLOAD_KIND_PHYP; #endif - //If PHYP or Sapphire w/SP Base Services + //If PHYP or Sapphire if( (TARGETING::PAYLOAD_KIND_PHYP == payload_kind ) || - ((TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind ) && - INITSERVICE::spBaseServicesEnabled())) + (TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind )) { // PHYP TARGETING::ATTR_PAYLOAD_BASE_type payload_base @@ -600,10 +599,9 @@ errlHndl_t hdatService::getHostDataSection( SectionId i_section, // we're all done break; } - //If payload is not (PHYP or Sapphire w/SP Base Services ) + //If payload is not (PHYP or Sapphire) else if( !((TARGETING::PAYLOAD_KIND_PHYP == payload_kind ) || - ((TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind ) && - INITSERVICE::spBaseServicesEnabled()))) + (TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind ))) { TRACFCOMP( g_trac_runtime, "getHostDataSection> There is no host data for PAYLOAD_KIND=%d", payload_kind ); /*@ @@ -1203,10 +1201,9 @@ errlHndl_t hdatService::updateHostDataSectionActual( SectionId i_section, // we're all done -- don't need to do anything break; } - //If payload is not (PHYP or Sapphire w/SP Base Services) + //If payload is not (PHYP or Sapphire) else if( !((TARGETING::PAYLOAD_KIND_PHYP == payload_kind ) || - ((TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind ) && - INITSERVICE::spBaseServicesEnabled()))) + (TARGETING::PAYLOAD_KIND_SAPPHIRE == payload_kind ))) { TRACFCOMP( g_trac_runtime, "get_host_data_section> There is no host data for PAYLOAD_KIND=%d", payload_kind ); /*@ |
