diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2017-01-07 09:10:50 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-01-12 10:03:15 -0500 |
| commit | edc92ae59f23c78159db05383c4c2fd21acfd2c1 (patch) | |
| tree | bba03131029ec93c2b95945dfc2e626028281067 /src/usr | |
| parent | 7d9f92073588c7ab8c1871e0a4b3680ac7008955 (diff) | |
| download | talos-hostboot-edc92ae59f23c78159db05383c4c2fd21acfd2c1.tar.gz talos-hostboot-edc92ae59f23c78159db05383c4c2fd21acfd2c1.zip | |
Enable PVPD to be read from PNOR only, add HW info
Change-Id: I95743ae74876b492d490dcef2ffc0866eaa6ee83
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34531
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 1 | ||||
| -rw-r--r-- | src/usr/vpd/pvpd.C | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 74f709794..ec05f999b 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -919,6 +919,7 @@ </attribute> <attribute><id>CDM_DOMAIN</id><default>NODE</default></attribute> <attribute><id>FRU_ID</id></attribute> + <attribute><id>EEPROM_VPD_PRIMARY_INFO</id></attribute> <attribute><id>MSS_VOLT_VPP_SLOPE_EFF_CONFIG</id></attribute> <attribute><id>MSS_VOLT_VPP_INTERCEPT_EFF_CONFIG</id></attribute> <attribute><id>MSS_VOLT_DDR3_VDDR_SLOPE_EFF_CONFIG</id></attribute> diff --git a/src/usr/vpd/pvpd.C b/src/usr/vpd/pvpd.C index 8017776b9..687f7fed3 100644 --- a/src/usr/vpd/pvpd.C +++ b/src/usr/vpd/pvpd.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -244,8 +244,8 @@ errlHndl_t nodePresenceDetect(DeviceFW::OperationType i_opType, return l_errl; } -#if defined(CONFIG_PVPD_READ_FROM_HW) && defined(CONFIG_PVPD_READ_FROM_PNOR) pvpd_present = VPD::pvpdPresent( i_target ); +#if(defined( CONFIG_PVPD_READ_FROM_HW ) && !defined( __HOSTBOOT_RUNTIME) ) if( pvpd_present ) { // Check if the VPD data in the PNOR matches the SEEPROM |
