summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/usr/sbe/sbe_resolve_sides.C1
-rw-r--r--src/usr/sbe/sbe_update.C1
-rwxr-xr-xsrc/usr/targeting/common/genHwsvMrwXml.pl8
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
OpenPOWER on IntegriCloud