diff options
| author | Mike Baiocchi <baiocchi@us.ibm.com> | 2015-03-11 14:51:41 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-04-02 17:43:56 -0500 |
| commit | 1589b88f270c07ea4dfde30f9abd7aa5bbad6a70 (patch) | |
| tree | a71f442d74329bc0e3fe14907885077762c743bc /src | |
| parent | 55c5a866426a9b5c319717f782e1ffe22962ee49 (diff) | |
| download | talos-hostboot-1589b88f270c07ea4dfde30f9abd7aa5bbad6a70.tar.gz talos-hostboot-1589b88f270c07ea4dfde30f9abd7aa5bbad6a70.zip | |
Skip SBE Update in istep 6 with simics running
Since the simics sessions do not start with proper SBE Seeprom
objects, we need to skip the SBE Update istep 6.10 function
resolveProcessorSbeSeeproms().
Change-Id: I5f7b74b6ff04f99ef07e34cd561c831f176b6994
RTC: 124877
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16301
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbe/sbe_resolve_sides.C | 13 | ||||
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/usr/sbe/sbe_resolve_sides.C b/src/usr/sbe/sbe_resolve_sides.C index 26ac4e6dc..11d500734 100644 --- a/src/usr/sbe/sbe_resolve_sides.C +++ b/src/usr/sbe/sbe_resolve_sides.C @@ -123,13 +123,22 @@ errlHndl_t resolveProcessorSbeSeeproms() } else { - TRACUCOMP( g_trac_sbe, INFO_MRK"resolveProcessorSbeSeeproms() - " - "Do Nothing in SBE_UPDATE_INDEPENDENT mode with FSP-" + TRACFCOMP( g_trac_sbe, INFO_MRK"resolveProcessorSbeSeeproms() - " + "Do Nothing in SBE_UPDATE_SEQUENTIAL mode with FSP-" "services enabled or running in simics"); break; } #endif + + // Don't run this function in simics + if ( Util::isSimicsRunning() ) + { + TRACFCOMP( g_trac_sbe, INFO_MRK"resolveProcessorSbeSeeproms() - " + "Do Nothing in SBE_UPDATE_INDEPENDENT mode in simics"); + break; + } + // Get Target Service, and the system target. TargetService& tS = targetService(); TARGETING::Target* sys = NULL; diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 5ac49098b..28b64379f 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1791,8 +1791,8 @@ namespace SBE reinterpret_cast<void*>(SBE_IMG_VADDR), ((io_sbeState.seeprom_side_to_update == EEPROM::SBE_PRIMARY ) ? - SBE_SEEPROM0 : - SBE_SEEPROM1 ), + SBE_SEEPROM0 : + SBE_SEEPROM1 ), PNOR::WORKING, imageWasUpdated ); |
