diff options
author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2019-05-30 08:50:41 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-05-31 09:45:27 -0500 |
commit | 8fb322bab4c13a7901d944908705daa379812ecc (patch) | |
tree | 0fd733da07ffe0a7e68048df6240c225e5e252f8 /src/usr | |
parent | 3d09e6cb299bf09346174faf1444480967f44156 (diff) | |
download | blackbird-hostboot-8fb322bab4c13a7901d944908705daa379812ecc.tar.gz blackbird-hostboot-8fb322bab4c13a7901d944908705daa379812ecc.zip |
Remove 'EXPLORER' as attribute MODEL type
This is a follow-on commit where the Explorer and Gemini targets
were made to share a common 'OCMB' MODEL type. The 'EXPLORER' MODEL
type can now be removed as the differnt OCMBs can be distinguished
by their CHIP_IDs.
Change-Id: Id38b91da2e8202e442b77e9373e449350d3c9b68
RTC:210226
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78084
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
4 files changed, 1 insertions, 12 deletions
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C index 664e4b35b..1884830e1 100755 --- a/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C +++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Configurator.C @@ -304,9 +304,6 @@ errlHndl_t PlatConfigurator::addDomainChips( TARGETING::TYPE i_type, uint32_t model = getChipModel( trgt ); #ifdef __HOSTBOOT_MODULE - // TODO: remove depricated MODEL_EXPLORER once MODEL_OCMB is supported. - if ( MODEL_EXPLORER == model ) continue; - // Special case for OCMBs (hostboot only issue for P9). if ( MODEL_OCMB == model ) { diff --git a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C index d3de91189..0614e6ed9 100644 --- a/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C +++ b/src/usr/diag/prdf/occ_firdata/prdfWriteHomerFirData.C @@ -942,10 +942,6 @@ errlHndl_t getHwConfig( std::vector<HOMER_ChipInfo_t> & o_chipInfVector, // Iterate all of the OCMB chips. for ( auto & ocmb : getFunctionalTargetList(TYPE_OCMB_CHIP) ) { - // TODO: remove depricated MODEL_EXPLORER once MODEL_OCMB is - // supported. - if ( MODEL_EXPLORER == getChipModel(ocmb) ) continue; - // Get the OCMB chip type. HOMER_ChipType_t ocmbType = HOMER_CHIP_INVALID; switch ( getChipId(ocmb) ) diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 2e3f34c8a..686a5af57 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -3903,10 +3903,6 @@ <name>CENTAUR</name> <value>48</value> </enumerator> - <!-- @TODO 210226: Remove EXPLORER once dependencies have switched to OCMB --> - <enumerator> - <name>EXPLORER</name> - </enumerator> <enumerator> <name>OCMB</name> </enumerator> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 3ebc3b5c7..46ddaddac 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -404,7 +404,7 @@ </attribute> </targetType> - <!-- Generic OCMB, used for Exlporer, Gemini, etc --> + <!-- Generic OCMB, used for Explorer, Gemini, etc --> <targetType> <id>chip-ocmb</id> <parent>chip</parent> |