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/vpd | |
| 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/vpd')
| -rw-r--r-- | src/usr/vpd/rtvpd_load.C | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/usr/vpd/rtvpd_load.C b/src/usr/vpd/rtvpd_load.C index 633b918ca..3695c8de0 100644 --- a/src/usr/vpd/rtvpd_load.C +++ b/src/usr/vpd/rtvpd_load.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -111,10 +111,8 @@ errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr) void* vptr = reinterpret_cast<void*>(o_vpd_addr); uint8_t* vpd_ptr = reinterpret_cast<uint8_t*>(vptr); - // OPAL builds everything at top of memory. - // PHYP adjunct partition will use HDAT memory ptrs - bool l_isPhyp = TARGETING::is_phyp_load(); - if (!l_isPhyp) + bool l_is_no_load = TARGETING::is_no_load(); + if( l_is_no_load ) { o_vpd_addr = TARGETING::get_top_mem_addr(); assert (o_vpd_addr != 0, @@ -127,8 +125,7 @@ errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr) vpd_ptr = reinterpret_cast<uint8_t*>(vptr); assert(vptr != NULL,"bld_devtree: Could not map VPD memory"); - } // if NOT phyp - + } err = bld_vpd_image(PNOR::DIMM_JEDEC_VPD, vpd_ptr, @@ -156,7 +153,7 @@ errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr) break; } - if (!l_isPhyp) + if ( l_is_no_load ) { mm_block_unmap(vptr); } |
