diff options
-rw-r--r-- | src/usr/pnor/sfc_ibm.C | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/usr/pnor/sfc_ibm.C b/src/usr/pnor/sfc_ibm.C index acdcfffac..8c318e939 100644 --- a/src/usr/pnor/sfc_ibm.C +++ b/src/usr/pnor/sfc_ibm.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -545,14 +545,6 @@ errlHndl_t SfcIBM::hwInit( ) "SfcIBM::hwInit: iv_norChipId=0x%.8x> ", iv_norChipId ); - //Query the configured size of the erase block - l_err = readReg(SFC_CMD_SPACE, - SFC_REG_ERASMS, - iv_eraseSizeBytes); - if(l_err) { break; } - TRACFCOMP(g_trac_pnor,"iv_eraseSizeBytes=0x%X",iv_eraseSizeBytes); - - #ifndef CONFIG_BMC_DOES_SFC_INIT TRACFCOMP( g_trac_pnor, INFO_MRK "Initializing SFC registers" ); @@ -651,6 +643,13 @@ errlHndl_t SfcIBM::hwInit( ) #endif //!CONFIG_BMC_DOES_SFC_INIT + //Query the configured size of the erase block + l_err = readReg(SFC_CMD_SPACE, + SFC_REG_ERASMS, + iv_eraseSizeBytes); + if(l_err) { break; } + TRACFCOMP(g_trac_pnor,"iv_eraseSizeBytes=0x%X",iv_eraseSizeBytes); + #ifdef CONFIG_ALLOW_MICRON_PNOR if( iv_norChipId == PNOR::MICRON_NOR_ID ) |