Add TARGET_TYPE_GENERICI2CSLAVE and relevant attributes

Change-Id: I7d7579f66aba39ab8a462215417e7ab7745f3a6b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90321
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/90332
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>

3 files changed, 105 insertions, 39 deletions

diff --git a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
index cd1620a03..54488b163 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2019                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2020                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -41,7 +41,8 @@
       TARGET_TYPE_DIMM,
       TARGET_TYPE_L4,TARGET_TYPE_MC,
       TARGET_TYPE_MEM_PORT,
-      TARGET_TYPE_PMIC
+      TARGET_TYPE_PMIC,
+      TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
     <description>
       1 if the target is functional, else 0.  Set by the platform.
@@ -58,7 +59,8 @@
     <id>ATTR_POS</id>
     <targetType>
       TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP,
-      TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC
+      TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_PMIC,
+      TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
     <description>
       Physical position of chip/dimm within drawer
@@ -81,7 +83,8 @@
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
       TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
       TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4, TARGET_TYPE_MC,
-      TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+      TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+      TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
     <description>
       Logical position of target within a system. This is derived from the SMP location
@@ -112,7 +115,8 @@
       TARGET_TYPE_MBA, TARGET_TYPE_ABUS, TARGET_TYPE_L4,
       TARGET_TYPE_MEM_PORT,
       TARGET_TYPE_DIMM,
-      TARGET_TYPE_PMIC
+      TARGET_TYPE_PMIC,
+      TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
     <description>
       A target's position relative to its immediate parent target.
@@ -130,6 +134,7 @@
       PROC - MC - MI - MCC - OMI
         (OMIC - OMI is not supported)
       OCMB - PMIC
+      OCMB - GENERICI2CSLAVE
       MEMBUF - MBA - DIMM
       MEMBUF - L4
       OCMB - MEM_PORT - DIMM
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml
index 35098b3cc..2f8356261 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/i2cslave_attributes.xml
@@ -23,4 +23,32 @@
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <attributes>
+  <!-- ******************************************************************************** -->
+  <attribute>
+    <id>ATTR_I2C_DEV_TYPE</id>
+    <targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
+    <description>
+      Device type of I2C slave device
+    </description>
+    <enum>
+      ADS7138_ADC,
+      PCA9554A_GPIO_EXPANDER
+    </enum>
+    <valueType>uint8</valueType>
+    <platInit/>
+    <default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
+  </attribute>
+  <!-- ******************************************************************************** -->
+  <attribute>
+    <id>ATTR_I2C_SUB_POS</id>
+    <targetType>TARGET_TYPE_GENERICI2CSLAVE</targetType>
+    <description>
+      Represents the ordinal position of this target compared to other peer
+      GENERICI2CSLAVE targets with the same ATTR_I2C_DEV_TYPE
+    </description>
+    <valueType>uint8</valueType>
+    <platInit/>
+    <default>0xFF</default><!-- Ensures platform explicitly puts a valid number in here -->
+  </attribute>
+  <!-- ******************************************************************************** -->
 </attributes>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
index 7af9c5474..5d5087b29 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2019                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2020                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -40,7 +40,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
     <description>
         Scratch uint8_t attribute.
@@ -59,7 +60,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -79,7 +81,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -99,7 +102,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -119,7 +123,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -139,7 +144,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -159,7 +165,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -179,7 +186,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -200,7 +208,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -221,7 +230,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -242,7 +252,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -263,7 +274,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -284,7 +296,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -305,7 +318,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -326,7 +340,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -347,7 +362,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -369,7 +385,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -389,7 +406,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT,TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -409,7 +427,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -429,7 +448,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -449,7 +469,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -469,7 +490,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -489,7 +511,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -509,7 +532,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -530,7 +554,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -551,7 +576,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -572,7 +598,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -593,7 +620,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -614,7 +642,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -635,7 +664,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -656,7 +686,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -677,7 +708,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>
@@ -699,7 +731,8 @@
     TARGET_TYPE_CAPP, TARGET_TYPE_DMI, TARGET_TYPE_OBUS ,TARGET_TYPE_OBUS_BRICK ,
     TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV, TARGET_TYPE_PEC,
     TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
-    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP, TARGET_TYPE_MEM_PORT, TARGET_TYPE_PMIC,
+    TARGET_TYPE_GENERICI2CSLAVE
     </targetType>
 
     <description>