diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2015-11-11 13:14:32 -0600 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 15:30:28 -0600 |
| commit | b06ecf7fa73668849af09d5f4a372629516f3565 (patch) | |
| tree | b7168053409b07bf773be4524aac7f64a4c87223 /src/usr/pnor | |
| parent | 86aa79ffb51fc1286dad97d4275ee805d95c9b7e (diff) | |
| download | blackbird-hostboot-b06ecf7fa73668849af09d5f4a372629516f3565.tar.gz blackbird-hostboot-b06ecf7fa73668849af09d5f4a372629516f3565.zip | |
Move read of ibm_sfc erase block size after sfc init
Change-Id: I905a31d50d22d4433e8d14142aaae8c65fb086e1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21963
Tested-by: Jenkins Server
Reviewed-by: Christian Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
| -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 ) |
