diff options
author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2019-04-19 08:49:20 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-05-16 11:07:15 -0500 |
commit | 4f842cf1d6febb37ca7917e40a9fb0a1e9e3e6e4 (patch) | |
tree | 478a17720159c864be8faab70692906fa74016fb /src/usr/targeting/common/xmltohb/target_types.xml | |
parent | 686bbf502fc63b486fb54816e3f7d4e7a7ce6bd7 (diff) | |
download | blackbird-hostboot-4f842cf1d6febb37ca7917e40a9fb0a1e9e3e6e4.tar.gz blackbird-hostboot-4f842cf1d6febb37ca7917e40a9fb0a1e9e3e6e4.zip |
Combine 'generic' and 'explorer' OCMB chip targets
This commit moves the Explorer-specific OCMB_CHIP target into the
'generic' OCMB_CHIP target so that there is only one target. This
target will also be used for Gemini. Changes were also made to look
for Gemini vs Explorer where appropriate based on ATTR_CHIP_ID.
Change-Id: I91b79195bf997a6af4e2ae0a3326ed5a1c7887ec
RTC:205563
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77220
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: Glenn Miles <milesg@ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/common/xmltohb/target_types.xml')
-rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index c04afc747..190ea86fc 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 --> + <!-- Generic OCMB, used for Exlporer, Gemini, etc --> <targetType> <id>chip-ocmb</id> <parent>chip</parent> @@ -480,6 +480,10 @@ <id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id> </attribute> <attribute> + <default>OCMB</default> + <id>MODEL</id> + </attribute> + <attribute> <default> <field> <id>childRollupAllowed</id> @@ -497,23 +501,6 @@ <id>PARENT_DECONFIG_RULES</id> </attribute> <attribute> - <default>OCMB_CHIP</default> - <id>TYPE</id> - </attribute> - <attribute> - <id>VPD_REC_NUM</id> - </attribute> - </targetType> - - <!-- Explorer OCMB --> - <targetType> - <id>chip-ocmb-explorer</id> - <parent>chip-ocmb</parent> - <attribute> - <default>EXPLORER</default> - <id>MODEL</id> - </attribute> - <attribute> <default> <field> <id>reserved</id> @@ -563,6 +550,13 @@ </default> <id>SCOM_SWITCHES</id> </attribute> + <attribute> + <default>OCMB_CHIP</default> + <id>TYPE</id> + </attribute> + <attribute> + <id>VPD_REC_NUM</id> + </attribute> </targetType> <targetType> |