diff options
Diffstat (limited to 'src/usr/sbe/sbe_update.C')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 3cde06023..c290fb0e5 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -33,6 +33,7 @@ #include <targeting/common/targetservice.H> #include <util/align.H> #include <util/crc32.H> +#include <util/misc.H> #include <errno.h> #include <pnor/pnorif.H> #include <pnor/ecc.H> @@ -1803,9 +1804,10 @@ namespace SBE } // Check if in simics - // @todo RTC 94883 - Update this check with a magic instruction - if ( io_sbeState.seeprom_0_ver.struct_version == - SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + if ( ( io_sbeState.seeprom_0_ver.struct_version == + SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + && ( Util::isSimicsRunning() ) + ) { isSimics_check = true; } @@ -1851,9 +1853,10 @@ namespace SBE } // Check if in simics - // @todo RTC 94883 - Update this check with a magic instruction - if ( io_sbeState.seeprom_1_ver.struct_version == - SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + if ( ( io_sbeState.seeprom_1_ver.struct_version == + SBE_SEEPROM_STRUCT_SIMICS_VERSION ) + && ( Util::isSimicsRunning() ) + ) { isSimics_check = true; } |
