diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2015-02-23 11:18:24 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-10 22:50:47 -0500 |
| commit | 788ec2a6d01df562f38352443bacd68c9cb0c633 (patch) | |
| tree | dfff993e6fe30c9d1605bffe442508bceaed71ee /src/usr/sbe/sbe_resolve_sides.H | |
| parent | 2a1d6e44f9dee4b665978be5e0eb0ef47a9e0be0 (diff) | |
| download | talos-hostboot-788ec2a6d01df562f38352443bacd68c9cb0c633.tar.gz talos-hostboot-788ec2a6d01df562f38352443bacd68c9cb0c633.zip | |
Remove pnorsbe.C and move seeprom code back to SBE namespace
PNOR code no longer uses getSbeBootSeeprom() and it makes
more sense to keep this function in the sbe component
Change-Id: Ic984f1af35fcc7346242bee03c69d16796ef7c09
RTC: 123369
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15912
Tested-by: Jenkins Server
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/sbe/sbe_resolve_sides.H')
| -rw-r--r-- | src/usr/sbe/sbe_resolve_sides.H | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/usr/sbe/sbe_resolve_sides.H b/src/usr/sbe/sbe_resolve_sides.H index d7c1f7c56..9e116e001 100644 --- a/src/usr/sbe/sbe_resolve_sides.H +++ b/src/usr/sbe/sbe_resolve_sides.H @@ -43,7 +43,7 @@ namespace SBE /******************************************/ // This seeprom is a candidate to be READ_ONLY (ie, not updated) - const PNOR::sbeSeepromSide_t READ_ONLY_SEEPROM = PNOR::SBE_SEEPROM1; + const sbeSeepromSide_t READ_ONLY_SEEPROM = SBE_SEEPROM1; // Used to keep SBE Seeproms in sync with EEPROM::eeprom_chip_types_t const EEPROM::eeprom_chip_types_t sbe_side_sync[2] = @@ -81,9 +81,9 @@ namespace SBE // Target Information TARGETING::Target* tgt; - PNOR::sbeSeepromSide_t cur_side; // aka 'booted' side - PNOR::sbeSeepromSide_t alt_side; // non-booted/non-cur side - PNOR::sbeSeepromSide_t update_side; // side to be updated + sbeSeepromSide_t cur_side; // aka 'booted' side + sbeSeepromSide_t alt_side; // non-booted/non-cur side + sbeSeepromSide_t update_side; // side to be updated // Info from PNOR PNOR::SideId pnor_sideId; @@ -95,9 +95,9 @@ namespace SBE // Constructor to default certain values sbeResolveState_t() : - tgt(NULL), cur_side(PNOR::SBE_SEEPROM_INVALID), - alt_side(PNOR::SBE_SEEPROM_INVALID), - update_side(PNOR::SBE_SEEPROM_INVALID), + tgt(NULL), cur_side(SBE_SEEPROM_INVALID), + alt_side(SBE_SEEPROM_INVALID), + update_side(SBE_SEEPROM_INVALID), pnor_sideId(PNOR::WORKING), pnor_side(NULL), pnor_isGolden(false), pnor_hasOtherSide(false), @@ -166,7 +166,7 @@ namespace SBE */ errlHndl_t readSbeImage(TARGETING::Target* i_target, void* o_imgPtr, - PNOR::sbeSeepromSide_t i_side, + sbeSeepromSide_t i_side, size_t& o_image_size, sbeSeepromVersionInfo_t& o_version); @@ -192,11 +192,10 @@ namespace SBE */ errlHndl_t writeSbeImage(TARGETING::Target* i_target, void* i_imgPtr, - PNOR::sbeSeepromSide_t i_side, + sbeSeepromSide_t i_side, size_t i_image_size, sbeSeepromVersionInfo_t& io_version); - /** * @brief Read SBE Image Header from SBE Seeprom and gets the * Image size from the heaser @@ -214,7 +213,7 @@ namespace SBE */ errlHndl_t getSbeImageSize(TARGETING::Target* i_target, void* i_imgPtr, - PNOR::sbeSeepromSide_t i_side, + sbeSeepromSide_t i_side, size_t& o_image_size); @@ -245,7 +244,7 @@ namespace SBE */ errlHndl_t resolveImageHBBaddr(TARGETING::Target* i_target, void* io_imgPtr, - PNOR::sbeSeepromSide_t i_side, + sbeSeepromSide_t i_side, PNOR::SideId i_pnorSideId, bool& o_imageWasUpdated); |
