Add more fapi2 target types for Axone

Change-Id: Ie825c3e9034f657aed821c43ebafb242bd125cd5
Signed-off-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57946
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@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: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57957
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, 96 insertions, 45 deletions

diff --git a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
index 8afbc0219..e131d9065 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -26,7 +26,11 @@
   <!-- ******************************************************************************** -->
   <attribute>
     <id>ATTR_NAME</id>
-    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <targetType>
+      TARGET_TYPE_PROC_CHIP,
+      TARGET_TYPE_MEMBUF_CHIP,
+      TARGET_TYPE_OCMB_CHIP
+    </targetType>
     <description>
       Product name of a chip target.
       Provided by the MRW.
@@ -37,7 +41,8 @@
       CENTAUR = 0x3,
       NIMBUS = 0x5,
       CUMULUS = 0x6,
-      AXONE = 0x7
+      AXONE = 0x7,
+      EXPLORER = 0x8
     </enum>
     <platInit/>
     <privileged/>
@@ -45,7 +50,11 @@
   <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_EC</id>
-    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <targetType>
+      TARGET_TYPE_PROC_CHIP,
+      TARGET_TYPE_MEMBUF_CHIP,
+      TARGET_TYPE_OCMB_CHIP
+    </targetType>
     <description>
         EC level of a chip target.
         Read from the chip by the platform
@@ -59,7 +68,11 @@
   <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_MINI_EC</id>
-    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP</targetType>
+    <targetType>
+      TARGET_TYPE_PROC_CHIP,
+      TARGET_TYPE_MEMBUF_CHIP,
+      TARGET_TYPE_OCMB_CHIP
+    </targetType>
     <description>
         Specifies extra mini-EC versions beyond the standard Major.Minor DD
         level, e.g. 1.02 would have ATTR_EC=0x10, ATTR_MINI_EC=2
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 b5a61b6f9..cffd76b86 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,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -30,11 +30,12 @@
       TARGET_TYPE_PROC_CHIP,
       TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ,
       TARGET_TYPE_MCS, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI, TARGET_TYPE_DMI,
-      TARGET_TYPE_MC, TARGET_TYPE_OMI,
+      TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC, TARGET_TYPE_MCC,
       TARGET_TYPE_XBUS, TARGET_TYPE_OBUS,
       TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
       TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
+      TARGET_TYPE_OCMB_CHIP,
       TARGET_TYPE_MEMBUF_CHIP,
       TARGET_TYPE_MBA,
       TARGET_TYPE_DIMM,
@@ -53,7 +54,10 @@
   <!-- ******************************************************************************** -->
   <attribute>
     <id>ATTR_POS</id>
-    <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM</targetType>
+    <targetType>
+      TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP,
+      TARGET_TYPE_DIMM, TARGET_TYPE_OCMB_CHIP
+    </targetType>
     <description>
       Physical position of chip/dimm within drawer
       This data is from the MRW.
@@ -66,9 +70,10 @@
     <id>ATTR_FAPI_POS</id>
     <targetType>
       TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM,
+      TARGET_TYPE_OCMB_CHIP,
       TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ,
       TARGET_TYPE_MCS, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI, TARGET_TYPE_DMI,
-      TARGET_TYPE_MC, TARGET_TYPE_OMI,
+      TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC, TARGET_TYPE_MCC,
       TARGET_TYPE_XBUS, TARGET_TYPE_OBUS,
       TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
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 c0852386b..33063eb02 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,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -39,7 +39,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint8_t attribute.
         Can be used by HWPs for testing.
@@ -56,7 +57,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint8_t attribute.
         Can be used by HWPs for testing.
@@ -73,7 +75,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint16_t attribute.
         Can be used by HWPs for testing.
@@ -90,7 +93,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint16_t attribute.
         Can be used by HWPs for testing.
@@ -107,7 +111,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint32_t attribute.
         Can be used by HWPs for testing.
@@ -124,7 +129,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint32_t attribute.
         Can be used by HWPs for testing.
@@ -141,7 +147,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint64_t attribute.
         Can be used by HWPs for testing.
@@ -158,7 +165,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint64_t attribute
         Can be used by HWPs for testing.
@@ -176,7 +184,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint8_t[32] attribute.
         Can be used by HWPs for testing.
@@ -194,7 +203,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint8_t[2][3][4] attribute.
         Can be used by HWPs for testing.
@@ -212,7 +222,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint16_t[16] attribute.
         Can be used by HWPs for testing.
@@ -230,7 +241,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint16_t[2][3][2] attribute.
         Can be used by HWPs for testing.
@@ -248,7 +260,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint32_t[8] attribute.
         Can be used by HWPs for testing.
@@ -266,7 +279,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint32_t[2][3] attribute.
         Can be used by HWPs for testing.
@@ -284,7 +298,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint64_t[4] attribute.
         Can be used by HWPs for testing.
@@ -302,7 +317,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch uint64_t[2][2] attribute.
         Can be used by HWPs for testing.
@@ -321,7 +337,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int8_t attribute.
         Can be used by HWPs for testing.
@@ -338,7 +355,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int8_t attribute.
         Can be used by HWPs for testing.
@@ -355,7 +373,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int16_t attribute.
         Can be used by HWPs for testing.
@@ -372,7 +391,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int16_t attribute.
         Can be used by HWPs for testing.
@@ -389,7 +409,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int32_t attribute.
         Can be used by HWPs for testing.
@@ -406,7 +427,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int32_t attribute.
         Can be used by HWPs for testing.
@@ -423,7 +445,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int64_t attribute.
         Can be used by HWPs for testing.
@@ -440,7 +463,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int64_t attribute
         Can be used by HWPs for testing.
@@ -458,7 +482,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int8_t[32] attribute.
         Can be used by HWPs for testing.
@@ -476,7 +501,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int8_t[2][3][4] attribute.
         Can be used by HWPs for testing.
@@ -494,7 +520,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int16_t[16] attribute.
         Can be used by HWPs for testing.
@@ -512,7 +539,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int16_t[2][3][2] attribute.
         Can be used by HWPs for testing.
@@ -530,7 +558,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int32_t[8] attribute.
         Can be used by HWPs for testing.
@@ -548,7 +577,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int32_t[2][3] attribute.
         Can be used by HWPs for testing.
@@ -566,7 +596,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int64_t[4] attribute.
         Can be used by HWPs for testing.
@@ -584,7 +615,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Scratch int64_t[2][2] attribute.
         Can be used by HWPs for testing.
@@ -603,7 +635,8 @@
     TARGET_TYPE_EQ, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI,
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC,
+    TARGET_TYPE_MCC, TARGET_TYPE_OCMB_CHIP</targetType>
     <description>
         Dummy platInit uint8[1][3][5] attribute used for testing.
     </description>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
index 2271c1d90..6f1cd978d 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -29,7 +29,7 @@
     <targetType>
       TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ,
       TARGET_TYPE_MCS, TARGET_TYPE_MCA, TARGET_TYPE_MCBIST, TARGET_TYPE_MI, TARGET_TYPE_DMI,
-      TARGET_TYPE_MC, TARGET_TYPE_OMI,
+      TARGET_TYPE_MC, TARGET_TYPE_OMI, TARGET_TYPE_OMIC, TARGET_TYPE_MCC,
       TARGET_TYPE_XBUS, TARGET_TYPE_OBUS,
       TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,