diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2015-11-18 14:01:33 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-03-24 10:27:41 -0400 |
| commit | b19c61f81dacb5088180946c5f415909965dd1fa (patch) | |
| tree | dc5d723cfba93998f68c0e85de11d05ab07b8b3c /src/usr/fsi | |
| parent | 16ff4c0894f726ea97362536af36a413b1f255cd (diff) | |
| download | talos-hostboot-b19c61f81dacb5088180946c5f415909965dd1fa.tar.gz talos-hostboot-b19c61f81dacb5088180946c5f415909965dd1fa.zip | |
Changes related to packaging of memory vpd on Nimbus - part 1
Lower level vpd and targeting plumbing changes for Nimbus direct memory
Change-Id: I6ac97404f5ef7432d14192945f9a1e258ed66dd3
RTC: 128112
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/711
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fsi')
| -rw-r--r-- | src/usr/fsi/fsipres.C | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/fsi/fsipres.C b/src/usr/fsi/fsipres.C index b092c0973..038e952b3 100644 --- a/src/usr/fsi/fsipres.C +++ b/src/usr/fsi/fsipres.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -272,7 +272,7 @@ errlHndl_t membPresenceDetect(DeviceFW::OperationType i_opType, bool cvpd_present = false; bool check_for_cvpd = true; -#ifdef CONFIG_CVPD_READ_FROM_HW +#ifdef CONFIG_MEMVPD_READ_FROM_HW check_for_cvpd = fsi_present; #endif @@ -282,7 +282,7 @@ errlHndl_t membPresenceDetect(DeviceFW::OperationType i_opType, } -#if defined(CONFIG_CVPD_READ_FROM_HW) && defined(CONFIG_CVPD_READ_FROM_PNOR) +#if defined(CONFIG_MEMVPD_READ_FROM_HW) && defined(CONFIG_MEMVPD_READ_FROM_PNOR) if( cvpd_present ) { // Check if the VPD data in the PNOR matches the SEEPROM |
