diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2016-09-23 16:04:02 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-09-24 01:10:51 -0400 |
| commit | 806fe73823828fee0be15a93e8661491e76bcf6b (patch) | |
| tree | 58106163bc82371e5b061bb24086f11b4360498a | |
| parent | 29e56e4a0b109851ce2e8b0904f1cd99f3326c9a (diff) | |
| download | talos-hostboot-806fe73823828fee0be15a93e8661491e76bcf6b.tar.gz talos-hostboot-806fe73823828fee0be15a93e8661491e76bcf6b.zip | |
Fix for ERROR: addEepromsProc: unrecognized Content Type
Change to the gen script to ignore entries with content type
PRIMARY_SBE_VPD_SPARE or REDUNDANT_SBE_VPD_SPARE when MRW generates
ZZ_hb.mrw.xml.
Temporarily completely disable the SBE update to avoid
assert for missing I2C_BUS_SPEED_ARRAY data.
Change-Id: Id3b1b1b7f739cb0abff3c9ae1511af06e035f1d2
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30200
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/usr/sbe/sbe_resolve_sides.C | 1 | ||||
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 1 | ||||
| -rwxr-xr-x | src/usr/targeting/common/genHwsvMrwXml.pl | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/usr/sbe/sbe_resolve_sides.C b/src/usr/sbe/sbe_resolve_sides.C index f659bce19..0c5deb548 100644 --- a/src/usr/sbe/sbe_resolve_sides.C +++ b/src/usr/sbe/sbe_resolve_sides.C @@ -75,6 +75,7 @@ namespace SBE { errlHndl_t resolveProcessorSbeSeeproms() { + return NULL;//@fixme-Temp hack to fix master errlHndl_t err = NULL; errlHndl_t err_cleanup = NULL; sbeResolveState_t sideState; diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index daffc76f3..d7e1868ae 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -93,6 +93,7 @@ namespace SBE { errlHndl_t updateProcessorSbeSeeproms(sbeUpdateCheckType i_check_type) { + return NULL;//@fixme-Temp hack to fix master errlHndl_t err = NULL; errlHndl_t err_cleanup = NULL; sbeTargetState_t sbeState; diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl index 0efaec828..702bf01c0 100755 --- a/src/usr/targeting/common/genHwsvMrwXml.pl +++ b/src/usr/targeting/common/genHwsvMrwXml.pl @@ -6513,6 +6513,14 @@ sub addEepromsProc { $id_name = "EEPROM_VPD_BACKUP_INFO"; } + elsif ( $tmp_ct eq "PRIMARY_SBE_VPD_SPARE") + { + next; # Skipping these entries + } + elsif ($tmp_ct eq "REDUNDANT_SBE_VPD_SPARE") + { + next; # Skipping these entries + } # Skipping these on openpower systems # @todo RTC 119830 - some of these might eventually be supported |
