add TARGET_TYPE_OMI

  update attribute xml

Change-Id: I8544e5149f1015887e503076bdca407356c77230
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44741
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44747
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

3 files changed, 38 insertions, 35 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 f2817caeb..a91734989 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
@@ -30,6 +30,7 @@
       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_XBUS, TARGET_TYPE_OBUS,
       TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
@@ -67,6 +68,7 @@
       TARGET_TYPE_PROC_CHIP, TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_DIMM,
       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_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 597279349..c0852386b 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
@@ -39,7 +39,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint8_t attribute.
         Can be used by HWPs for testing.
@@ -56,7 +56,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint8_t attribute.
         Can be used by HWPs for testing.
@@ -73,7 +73,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint16_t attribute.
         Can be used by HWPs for testing.
@@ -90,7 +90,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint16_t attribute.
         Can be used by HWPs for testing.
@@ -107,7 +107,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint32_t attribute.
         Can be used by HWPs for testing.
@@ -124,7 +124,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint32_t attribute.
         Can be used by HWPs for testing.
@@ -141,7 +141,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint64_t attribute.
         Can be used by HWPs for testing.
@@ -158,7 +158,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint64_t attribute
         Can be used by HWPs for testing.
@@ -176,7 +176,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint8_t[32] attribute.
         Can be used by HWPs for testing.
@@ -194,7 +194,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint8_t[2][3][4] attribute.
         Can be used by HWPs for testing.
@@ -212,7 +212,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint16_t[16] attribute.
         Can be used by HWPs for testing.
@@ -230,7 +230,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint16_t[2][3][2] attribute.
         Can be used by HWPs for testing.
@@ -248,7 +248,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint32_t[8] attribute.
         Can be used by HWPs for testing.
@@ -266,7 +266,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint32_t[2][3] attribute.
         Can be used by HWPs for testing.
@@ -284,7 +284,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint64_t[4] attribute.
         Can be used by HWPs for testing.
@@ -302,7 +302,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch uint64_t[2][2] attribute.
         Can be used by HWPs for testing.
@@ -321,7 +321,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int8_t attribute.
         Can be used by HWPs for testing.
@@ -332,14 +332,14 @@
   <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_SCRATCH_INT8_2</id>
-    <targetType>TARGET_TYPE_SYSTEM</targetType>
-    <description>TARGET_TYPE_SYSTEM , TARGET_TYPE_DIMM, TARGET_TYPE_PROC_CHIP,
+    <targetType>TARGET_TYPE_SYSTEM , TARGET_TYPE_DIMM, TARGET_TYPE_PROC_CHIP,
     TARGET_TYPE_MEMBUF_CHIP, TARGET_TYPE_EX, TARGET_TYPE_MBA, TARGET_TYPE_MCS,
     TARGET_TYPE_XBUS, TARGET_TYPE_ABUS, TARGET_TYPE_L4, TARGET_TYPE_CORE,
     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_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
+    <description>
         Scratch int8_t attribute.
         Can be used by HWPs for testing.
     </description>
@@ -355,7 +355,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int16_t attribute.
         Can be used by HWPs for testing.
@@ -372,7 +372,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int16_t attribute.
         Can be used by HWPs for testing.
@@ -389,7 +389,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int32_t attribute.
         Can be used by HWPs for testing.
@@ -406,7 +406,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int32_t attribute.
         Can be used by HWPs for testing.
@@ -423,7 +423,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int64_t attribute.
         Can be used by HWPs for testing.
@@ -440,7 +440,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int64_t attribute
         Can be used by HWPs for testing.
@@ -458,7 +458,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int8_t[32] attribute.
         Can be used by HWPs for testing.
@@ -476,7 +476,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int8_t[2][3][4] attribute.
         Can be used by HWPs for testing.
@@ -494,7 +494,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int16_t[16] attribute.
         Can be used by HWPs for testing.
@@ -512,7 +512,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int16_t[2][3][2] attribute.
         Can be used by HWPs for testing.
@@ -530,7 +530,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int32_t[8] attribute.
         Can be used by HWPs for testing.
@@ -548,7 +548,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int32_t[2][3] attribute.
         Can be used by HWPs for testing.
@@ -566,7 +566,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int64_t[4] attribute.
         Can be used by HWPs for testing.
@@ -584,7 +584,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</targetType>
     <description>
         Scratch int64_t[2][2] attribute.
         Can be used by HWPs for testing.
@@ -603,7 +603,7 @@
     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</targetType>
+    TARGET_TYPE_PHB, TARGET_TYPE_MC, TARGET_TYPE_OMI</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 faa6dd8b5..2271c1d90 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/unit_attributes.xml
@@ -29,6 +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_XBUS, TARGET_TYPE_OBUS,
       TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,