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>

4 files changed, 148 insertions, 81 deletions

diff --git a/src/import/hwpf/fapi2/include/target_types.H b/src/import/hwpf/fapi2/include/target_types.H
index 920d3309d..0eccb41a1 100644
--- a/src/import/hwpf/fapi2/include/target_types.H
+++ b/src/import/hwpf/fapi2/include/target_types.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -49,47 +49,48 @@ namespace fapi2
 /// Target Kind
 enum TargetType : uint64_t
 {
-    TARGET_TYPE_NONE          = 0x0000000000000000, ///< No type
-    TARGET_TYPE_SYSTEM        = 0x0000000000000001, ///< System type
-    TARGET_TYPE_DIMM          = 0x0000000000000002, ///< DIMM type
-    TARGET_TYPE_PROC_CHIP     = 0x0000000000000004, ///< Processor type
-    TARGET_TYPE_MEMBUF_CHIP   = 0x0000000000000008, ///< Membuf type
-    TARGET_TYPE_EX            = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
-    TARGET_TYPE_MBA           = 0x0000000000000020, ///< MBA type
-    TARGET_TYPE_MCS           = 0x0000000000000040, ///< MCS type
-    TARGET_TYPE_XBUS          = 0x0000000000000080, ///< XBUS type
-    TARGET_TYPE_ABUS          = 0x0000000000000100, ///< ABUS type
-    TARGET_TYPE_L4            = 0x0000000000000200, ///< L4 type
-    TARGET_TYPE_CORE          = 0x0000000000000400, ///< Core
-    TARGET_TYPE_EQ            = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
-    TARGET_TYPE_MCA           = 0x0000000000001000, ///< MCA type
-    TARGET_TYPE_MCBIST        = 0x0000000000002000, ///< MCBIST type
-    TARGET_TYPE_MI            = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
-    TARGET_TYPE_CAPP          = 0x0000000000008000, ///< CAPP target
-    TARGET_TYPE_DMI           = 0x0000000000010000, ///< DMI type
-    TARGET_TYPE_OBUS          = 0x0000000000020000, ///< OBUS type
-    TARGET_TYPE_OBUS_BRICK    = 0x0000000000040000, ///< OBUS BRICK type
-    TARGET_TYPE_SBE           = 0x0000000000080000, ///< SBE type
-    TARGET_TYPE_PPE           = 0x0000000000100000, ///< PPE type
-    TARGET_TYPE_PERV          = 0x0000000000200000, ///< Pervasive type
-    TARGET_TYPE_PEC           = 0x0000000000400000, ///< PEC type
-    TARGET_TYPE_PHB           = 0x0000000000800000, ///< PHB type
-    TARGET_TYPE_MC            = 0x0000000001000000, ///< MC type
-    TARGET_TYPE_OMI           = 0x0000000002000000, ///< OMI type
-    TARGET_TYPE_OMIC          = 0x0000000004000000, ///< OMIC type
-    TARGET_TYPE_MCC           = 0x0000000008000000, ///< MCC type
-    TARGET_TYPE_OCMB_CHIP     = 0x0000000010000000, ///< OCMB type
-    TARGET_TYPE_MEM_PORT      = 0x0000000020000000, ///< MEM_PORT type
-    TARGET_TYPE_NMMU          = 0x0000000040000000, ///< NEST MMU type
-    TARGET_TYPE_RESERVED      = 0x0000000080000000, ///< Reserved for Cronus (Z)
-    TARGET_TYPE_PAU           = 0x0000000100000000, ///< PAU type
-    TARGET_TYPE_IOHS          = 0x0000000200000000, ///< IOHS type
-    TARGET_TYPE_FC            = 0x0000000400000000, ///< Fused Core type
-    TARGET_TYPE_PMIC          = 0x0000000800000000, ///< PMIC type
-    TARGET_TYPE_PAUC          = 0x0000001000000000, ///< PAUC type
-    TARGET_TYPE_MULTICAST     = 0x8000000000000000, ///< MULTICAST type
-    TARGET_TYPE_ALL           = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
-    TARGET_TYPE_ALL_MC        = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
+    TARGET_TYPE_NONE            = 0x0000000000000000, ///< No type
+    TARGET_TYPE_SYSTEM          = 0x0000000000000001, ///< System type
+    TARGET_TYPE_DIMM            = 0x0000000000000002, ///< DIMM type
+    TARGET_TYPE_PROC_CHIP       = 0x0000000000000004, ///< Processor type
+    TARGET_TYPE_MEMBUF_CHIP     = 0x0000000000000008, ///< Membuf type
+    TARGET_TYPE_EX              = 0x0000000000000010, ///< EX - 2x Core, L2, L3 - can be deconfigured
+    TARGET_TYPE_MBA             = 0x0000000000000020, ///< MBA type
+    TARGET_TYPE_MCS             = 0x0000000000000040, ///< MCS type
+    TARGET_TYPE_XBUS            = 0x0000000000000080, ///< XBUS type
+    TARGET_TYPE_ABUS            = 0x0000000000000100, ///< ABUS type
+    TARGET_TYPE_L4              = 0x0000000000000200, ///< L4 type
+    TARGET_TYPE_CORE            = 0x0000000000000400, ///< Core
+    TARGET_TYPE_EQ              = 0x0000000000000800, ///< EQ - 4x core, 2x L2, 2x L3 - can be deconfigured
+    TARGET_TYPE_MCA             = 0x0000000000001000, ///< MCA type
+    TARGET_TYPE_MCBIST          = 0x0000000000002000, ///< MCBIST type
+    TARGET_TYPE_MI              = 0x0000000000004000, ///< MI Memory Interface (Cumulus)
+    TARGET_TYPE_CAPP            = 0x0000000000008000, ///< CAPP target
+    TARGET_TYPE_DMI             = 0x0000000000010000, ///< DMI type
+    TARGET_TYPE_OBUS            = 0x0000000000020000, ///< OBUS type
+    TARGET_TYPE_OBUS_BRICK      = 0x0000000000040000, ///< OBUS BRICK type
+    TARGET_TYPE_SBE             = 0x0000000000080000, ///< SBE type
+    TARGET_TYPE_PPE             = 0x0000000000100000, ///< PPE type
+    TARGET_TYPE_PERV            = 0x0000000000200000, ///< Pervasive type
+    TARGET_TYPE_PEC             = 0x0000000000400000, ///< PEC type
+    TARGET_TYPE_PHB             = 0x0000000000800000, ///< PHB type
+    TARGET_TYPE_MC              = 0x0000000001000000, ///< MC type
+    TARGET_TYPE_OMI             = 0x0000000002000000, ///< OMI type
+    TARGET_TYPE_OMIC            = 0x0000000004000000, ///< OMIC type
+    TARGET_TYPE_MCC             = 0x0000000008000000, ///< MCC type
+    TARGET_TYPE_OCMB_CHIP       = 0x0000000010000000, ///< OCMB type
+    TARGET_TYPE_MEM_PORT        = 0x0000000020000000, ///< MEM_PORT type
+    TARGET_TYPE_NMMU            = 0x0000000040000000, ///< NEST MMU type
+    TARGET_TYPE_RESERVED        = 0x0000000080000000, ///< Reserved for Cronus (Z)
+    TARGET_TYPE_PAU             = 0x0000000100000000, ///< PAU type
+    TARGET_TYPE_IOHS            = 0x0000000200000000, ///< IOHS type
+    TARGET_TYPE_FC              = 0x0000000400000000, ///< Fused Core type
+    TARGET_TYPE_PMIC            = 0x0000000800000000, ///< PMIC type
+    TARGET_TYPE_PAUC            = 0x0000001000000000, ///< PAUC type
+    TARGET_TYPE_GENERICI2CSLAVE = 0x0000002000000000, ///< GENERICI2CSLAVE type
+    TARGET_TYPE_MULTICAST       = 0x8000000000000000, ///< MULTICAST type
+    TARGET_TYPE_ALL             = 0x7FFFFFFFFFFFFFFF, ///< Any/All types
+    TARGET_TYPE_ALL_MC          = 0xFFFFFFFFFFFFFFFF, ///< Any/All types + Multicast
 
     // Compound target types
     TARGET_TYPE_CHIPS         = TARGET_TYPE_PROC_CHIP |
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>