diff options
author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-05-05 15:01:25 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-07-07 10:15:53 -0500 |
commit | f3d0860811a2ac58b12291f93b65786cd0914a07 (patch) | |
tree | 846631f5fffaffafcdc2f9f6343b7ae71ef90e5a /src/usr/sbe | |
parent | a2446df07549799749c8146634926dcb621244e9 (diff) | |
download | talos-hostboot-f3d0860811a2ac58b12291f93b65786cd0914a07.tar.gz talos-hostboot-f3d0860811a2ac58b12291f93b65786cd0914a07.zip |
Remove Hostboot SBE Update checks for Venice and istep
This commit re-enables SBE Update support for Brazos/Venice
configurations. It also re-enables SBE Update running during
an istep call.
Change-Id: I60826c2826593e162147295fb9ddb46e14983861
RTC: 97441
CMVC-Prereq: 925354
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10971
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/sbe')
-rw-r--r-- | src/usr/sbe/sbe_update.C | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index ba58215a6..f893ca573 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -120,15 +120,6 @@ namespace SBE (void) tS.getTopLevelTarget( sys ); assert(sys, "updateProcessorSbeSeeproms() system target is NULL"); - // @todo RTC 97441 - remove this check - if ( sys->getAttr<ATTR_ISTEP_MODE>() && // true => istep mode - INITSERVICE::spBaseServicesEnabled() ) // true => FSP present - { - TRACFCOMP( g_trac_sbe, INFO_MRK"SBE Update skipped due to " - "istep mode and FSP present"); - break; - } - /*****************************************************************/ /* Skip Update if MNFG_FLAG_FSP_UPDATE_SBE_IMAGE is set */ /* AND there is a FSP present */ @@ -208,16 +199,6 @@ namespace SBE err = NULL; } - // If Master Processor is Venice skip SBE Update - // @todo RTC 97441 remove this check - if( (masterProcChipTargetHandle->getAttr<TARGETING::ATTR_MODEL>() - == TARGETING::MODEL_VENICE) ) - { - TRACFCOMP( g_trac_sbe, INFO_MRK"updateProcessorSbeSeeproms() - " - "masterProcChipTargetHandle is Venice: skipping " - "SBE Update"); - break; - } for(uint32_t i=0; i<procList.size(); i++) { @@ -366,7 +347,7 @@ namespace SBE INFO_MRK"updateProcessorSbeSeeproms(): Calling " "INITSERVICE::doShutdown() with " "SBE_UPDATE_REQUEST_REIPL = 0x%X", - l_restartNeeded, SBE_UPDATE_REQUEST_REIPL ); + SBE_UPDATE_REQUEST_REIPL ); INITSERVICE::doShutdown(SBE_UPDATE_REQUEST_REIPL); } |