rename TYPE_NV to TYPE_OBUS_BRICK

Change-Id: I2915e0b76c16f1c789700c0ca300e601fd0c4cdd
RTC:171599
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39676
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39689
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

3 files changed, 39 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 82097faf9..f2817caeb 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/common_attributes.xml
@@ -31,7 +31,7 @@
       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_XBUS, TARGET_TYPE_OBUS,
-      TARGET_TYPE_NV,
+      TARGET_TYPE_OBUS_BRICK,
       TARGET_TYPE_SBE, TARGET_TYPE_PPE, TARGET_TYPE_PERV,
       TARGET_TYPE_PEC, TARGET_TYPE_PHB, TARGET_TYPE_CAPP,
       TARGET_TYPE_MEMBUF_CHIP,
@@ -68,7 +68,7 @@
       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_XBUS, TARGET_TYPE_OBUS,
-      TARGET_TYPE_NV,
+      TARGET_TYPE_OBUS_BRICK,
       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
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 83d0e1a50..597279349 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,2016                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -37,7 +37,7 @@
     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_NV ,
+    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>
     <description>
@@ -54,7 +54,7 @@
     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_NV ,
+    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>
     <description>
@@ -71,7 +71,7 @@
     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_NV ,
+    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>
     <description>
@@ -88,7 +88,7 @@
     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_NV ,
+    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>
     <description>
@@ -105,7 +105,7 @@
     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_NV ,
+    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>
     <description>
@@ -122,7 +122,7 @@
     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_NV ,
+    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>
     <description>
@@ -139,7 +139,7 @@
     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_NV ,
+    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>
     <description>
@@ -156,7 +156,7 @@
     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_NV ,
+    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>
     <description>
@@ -174,7 +174,7 @@
     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_NV ,
+    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>
     <description>
@@ -192,7 +192,7 @@
     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_NV ,
+    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>
     <description>
@@ -210,7 +210,7 @@
     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_NV ,
+    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>
     <description>
@@ -228,7 +228,7 @@
     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_NV ,
+    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>
     <description>
@@ -246,7 +246,7 @@
     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_NV ,
+    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>
     <description>
@@ -264,7 +264,7 @@
     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_NV ,
+    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>
     <description>
@@ -282,7 +282,7 @@
     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_NV ,
+    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>
     <description>
@@ -300,7 +300,7 @@
     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_NV ,
+    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>
     <description>
@@ -319,7 +319,7 @@
     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_NV ,
+    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>
     <description>
@@ -337,7 +337,7 @@
     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_NV ,
+    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
         Scratch int8_t attribute.
@@ -353,7 +353,7 @@
     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_NV ,
+    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>
     <description>
@@ -370,7 +370,7 @@
     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_NV ,
+    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>
     <description>
@@ -387,7 +387,7 @@
     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_NV ,
+    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>
     <description>
@@ -404,7 +404,7 @@
     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_NV ,
+    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>
     <description>
@@ -421,7 +421,7 @@
     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_NV ,
+    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>
     <description>
@@ -438,7 +438,7 @@
     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_NV ,
+    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>
     <description>
@@ -456,7 +456,7 @@
     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_NV ,
+    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>
     <description>
@@ -474,7 +474,7 @@
     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_NV ,
+    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>
     <description>
@@ -492,7 +492,7 @@
     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_NV ,
+    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>
     <description>
@@ -510,7 +510,7 @@
     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_NV ,
+    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>
     <description>
@@ -528,7 +528,7 @@
     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_NV ,
+    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>
     <description>
@@ -546,7 +546,7 @@
     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_NV ,
+    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>
     <description>
@@ -564,7 +564,7 @@
     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_NV ,
+    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>
     <description>
@@ -582,7 +582,7 @@
     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_NV ,
+    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>
     <description>
@@ -601,7 +601,7 @@
     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_NV ,
+    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>
     <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 9a3ed11b9..faa6dd8b5 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,2016                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -27,10 +27,10 @@
   <attribute>
     <id>ATTR_CHIP_UNIT_POS</id>
     <targetType>
-      TARGET_TYPE_CORE, TARGET_TYPE_EX, TARGET_TYPE_EQ, 
+      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_XBUS, TARGET_TYPE_OBUS,
-      TARGET_TYPE_NV,
+      TARGET_TYPE_OBUS_BRICK,
       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