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>

1 files changed, 16 insertions, 16 deletions

diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
index 2b1b0a3ef..c3dfb86eb 100644
--- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -8612,7 +8612,7 @@
 <!-- ===================================================================== -->
 <targetInstance>
     <id>sys0node0ocmb0</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-0/ocmb_chip-0</default>
@@ -8679,7 +8679,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb1</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-0/omi-1/ocmb_chip-0</default>
@@ -8746,7 +8746,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb2</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-0/ocmb_chip-0</default>
@@ -8813,7 +8813,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb3</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-0/mcc-1/omi-1/ocmb_chip-0</default>
@@ -8880,7 +8880,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb4</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-0/ocmb_chip-0</default>
@@ -8947,7 +8947,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb5</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-0/omi-1/ocmb_chip-0</default>
@@ -9014,7 +9014,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb6</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-0/ocmb_chip-0</default>
@@ -9081,7 +9081,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb7</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-0/mi-1/mcc-1/omi-1/ocmb_chip-0</default>
@@ -9148,7 +9148,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb8</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-0/omi-0/ocmb_chip-0</default>
@@ -9214,7 +9214,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb9</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-0/omi-1/ocmb_chip-0</default>
@@ -9280,7 +9280,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb10</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-1/omi-0/ocmb_chip-0</default>
@@ -9346,7 +9346,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb11</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-0/mcc-1/omi-1/ocmb_chip-0</default>
@@ -9412,7 +9412,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb12</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-0/omi-0/ocmb_chip-0</default>
@@ -9478,7 +9478,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb13</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-0/omi-1/ocmb_chip-0</default>
@@ -9544,7 +9544,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb14</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-1/omi-0/ocmb_chip-0</default>
@@ -9610,7 +9610,7 @@
 
 <targetInstance>
     <id>sys0node0ocmb15</id>
-    <type>chip-ocmb-explorer</type>
+    <type>chip-ocmb</type>
     <attribute>
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/mc-1/mi-1/mcc-1/omi-1/ocmb_chip-0</default>