VPO tools update for model m_4_a (s1_e8032_c0400_cen1_cen077_unopt_1)

Change-Id: If1d0e4b8922bd1e12941c1722ecc25d819e89b29
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1334
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

8 files changed, 373 insertions, 394 deletions

diff --git a/src/build/debug/Hostboot/ContTrace.pm b/src/build/debug/Hostboot/ContTrace.pm
index 1559199be..516c8eafd 100755
--- a/src/build/debug/Hostboot/ContTrace.pm
+++ b/src/build/debug/Hostboot/ContTrace.pm
@@ -20,8 +20,7 @@
 #
 #  Origin: 30
 #
-#  IBM_PROLOG_END
-
+#  IBM_PROLOG_END_TAG
 use strict;
 
 package Hostboot::ContTrace;
@@ -239,6 +238,7 @@ sub main
                 ::userDisplay $line;
             }
         }
+        unlink($fname[$i]);
     }
 
     if ($dbgMsg)
diff --git a/src/build/vpo/Setup_Env b/src/build/vpo/Setup_Env
index 32c60c1a3..f46fea3a4 100755..100644
--- a/src/build/vpo/Setup_Env
+++ b/src/build/vpo/Setup_Env
@@ -1,3 +1,27 @@
+#!/bin/sh "Use source to invoke this script"
+#  IBM_PROLOG_BEGIN_TAG
+#  This is an automatically generated prolog.
+#
+#  $Source: src/build/vpo/Setup_Env $
+#
+#  IBM CONFIDENTIAL
+#
+#  COPYRIGHT International Business Machines Corp. 2012
+#
+#  p1
+#
+#  Object Code Only (OCO) source materials
+#  Licensed Internal Code Source Materials
+#  IBM HostBoot Licensed Internal Code
+#
+#  The source code for this program is not published or other-
+#  wise divested of its trade secrets, irrespective of what has
+#  been deposited with the U.S. Copyright Office.
+#
+#  Origin: 30
+#
+#  IBM_PROLOG_END_TAG
+
 ################################################################################
 #
 # Setup intialization source script for HostBoot Sprint Release VPO/VBU model
@@ -17,6 +41,10 @@
 #                          Build hb0606a_1219.810
 #                          Add m_3_a Murano model
 #
+# Version 1.4   07-10-2012 Default HB_TOOLS to rel.20120710
+#                          Update for new m_4_a model, default to new checkpoint
+#                          Load SPD data
+#
 ################################################################################
 
 # Define useful pointers to automated tests/scripts
@@ -60,16 +88,14 @@ Setup_MyEnv() {
 	sprint=hb0606a_1219.810
 	
 	# Initialize HostBoot environment/cronus/tools - note new naming convention
-	
-	export AUTOVBU_CRONUS_SIM=rel.20120611
+	#export AUTOVBU_CRONUS_SIM=rel.20120709
+	export AUTOVBU_CRONUS_SIM=dev
+
 	export GLOBAL_DEBUG=8.VW.Vc.dG.F3.0I.E8.V
-	export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.20120611
+	export HB_TOOLS=$AUTOVBU_HBTOOLS_BASEDIR/rel.20120710
 
 	# Select default model -- choose either VBU or VPO versions
-	export VPO_MODEL=m_3_a; unset VBU_MODEL; VBUVPO=VPO
-	#export VBU_MODEL=p1_e8056_c1000_cen1_cen054_unopt_2_gfw; unset VPO_MODEL; VBUVPO=VBU
-	#export VBU_MODEL=p1_e8062_wafer_nomem_c1000_opt_4; unset VPO_MODEL; VBUVPO=VBU
-	#export VBU_MODEL=p1_e8062_c1000_cen1_cen061_unopt_1; unset VPO_MODEL; VBUVPO=VBU
+	export VPO_MODEL=m_4_a; unset VBU_MODEL; VBUVPO=VPO
 	
 	# Default AWAN request time - shorter periods get AWAN faster
 
@@ -78,8 +104,8 @@ Setup_MyEnv() {
 	# Default sprint test case settings
 	
 	export AUTOVBU_CORE=-cft
-	export AUTOVBU_SIMCLOCKS=5000000
-	export AUTOVBU_INITIAL_CHKPT=after_8megzero_newxscom
+	export AUTOVBU_SIMCLOCKS=3000000
+	export AUTOVBU_INITIAL_CHKPT=zero_vpo_after_proc_sbe
 	export AUTOVBU_LOOPS=1200
 	export AUTOVBU_PRINTK_LINES=50
 	
@@ -235,52 +261,32 @@ Setup_MyDynamic() {
 	# Set other defaults based upon MODEL
 	case "$VPO_MODEL$VBU_MODEL"
 	in
-                 s1_e8024_wafer_nomem_dc_opt_6|s1_e8026_c0400_cen1_cen069_unopt_1|m_3_a)
-                          export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-                          export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-                          unset DEFAULT_LEVEL
-                          ;;
-		p1_e8062_wafer_nomem_c1000_opt_4|m_2_e)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star4b}
-			export AWAN_CONFIG=${AWAN_CONFIG-star4b}
-			export DEFAULT_LEVEL=prev
-			;;
-		m_1_c|p1_e8056_c1000_cen1_cen054_unopt_2_gfw)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-cronusflex}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b_flex}
-			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-			export DEFAULT_LEVEL=prev
-			;;
-		m_2_a|p1_e8062_c1000_cen1_cen061_unopt_1)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-cronusflex}
-			export AWAN_SCRIPT=${AWAN_SCRIPT- run_script_star8b_flex}
-			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-			export DEFAULT_LEVEL=prev
-			;;
-		p1_e8056*|p1_e8059*|p1_e8062*)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b}
-			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-			export DEFAULT_LEVEL=prev
-			;;
-		s1_e8024_wafer_nomem_dc_opt_6)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b}
-			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-			unset DEFAULT_LEVEL
-			;;
-		s1_e8024_wafer_nomem*)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star4b}
-			export AWAN_CONFIG=${AWAN_CONFIG-star4b}
-			unset DEFAULT_LEVEL
-			;;
-		*)
-			export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
-			export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b}
-			export AWAN_CONFIG=${AWAN_CONFIG-star8b}
-			;;
+        s1_e8032_c0400_cen1_cen073_unopt_2|m_3_b)
+            export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
+            export AWAN_CONFIG=${AWAN_CONFIG-star8b}
+            unset DEFAULT_LEVEL
+            ;;
+        s1_e8032_c0400_cen1_cen077_unopt_1|m_4_a)
+            export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
+            export AWAN_CONFIG=${AWAN_CONFIG-star8b}
+            unset DEFAULT_LEVEL
+            ;;
+        s1_e8024_wafer_nomem_dc_opt_6|s1_e8026_c0400_cen1_cen069_unopt_1|m_3_a)
+            export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
+            export AWAN_CONFIG=${AWAN_CONFIG-star8b}
+            unset DEFAULT_LEVEL
+            ;;
+	m_2_a|p1_e8062_c1000_cen1_cen061_unopt_1)
+            export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-cronusflex}
+            export AWAN_SCRIPT=${AWAN_SCRIPT- run_script_star8b_flex}
+            export AWAN_CONFIG=${AWAN_CONFIG-star8b}
+            export DEFAULT_LEVEL=prev
+            ;;
+	*)
+            export AUTOVBU_ECMD_VER=${AUTOVBU_ECMD_VER-p8s1}
+            export AWAN_SCRIPT=${AWAN_SCRIPT-run_script_star8b}
+            export AWAN_CONFIG=${AWAN_CONFIG-star8b}
+            ;;
 	esac
 
 	if [ "$AUTOVBU_ECMD_VER" = "cronusflex" ]; then
@@ -454,11 +460,13 @@ Setup_MyHBImage() {
 
 		# Load initial checkpoint first
 
-		set -x
-		siminit ${AUTOVBU_INITIAL_CHKPT-after_8megzero} -quiet || return 1
-		$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/hbicore${use_test}.bin -b ${AUTOVBU_CORE--cft} || return 1
-		$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/vbu${use_test}.pnor -o 0x400000 -b ${AUTOVBU_CORE--cft} || return 1
-		set +x
+        set -x
+        siminit ${AUTOVBU_INITIAL_CHKPT-zero_vpo_after_proc_sbe} -quiet || return 1
+        $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/hbicore${use_test}.bin -b ${AUTOVBU_CORE--cft} || return 1
+        $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/vbu${use_test}.pnor -o 0x400000 -b ${AUTOVBU_CORE--cft} || return 1
+        $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/sysmvpd.dat -o 0x681000 -b ${CORE--cft} || exit 1
+        $HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMGDIR}/sysspd.dat -o 0x701000 -b ${CORE--cft} || exit 1
+        set +x
 	fi
 
 	return 0
diff --git a/src/build/vpo/VBU_Cacheline.pm b/src/build/vpo/VBU_Cacheline.pm
index 55de20dad..82e223988 100755..100644
--- a/src/build/vpo/VBU_Cacheline.pm
+++ b/src/build/vpo/VBU_Cacheline.pm
@@ -76,7 +76,7 @@ my  $curDir      =   getcwd();
 my  $CLfile     =   "$curDir/istepmodereg.dma";
 my  $CORE       =   "-cft";
 
-my  $SIM_CLOCKS =   "5000000";
+my  $SIM_CLOCKS =   "3000000";
 
 #############################################
 ##  Internal Globals
diff --git a/src/build/vpo/do_sprint b/src/build/vpo/do_sprint
index a9c3007cd..0cc929828 100755..100644
--- a/src/build/vpo/do_sprint
+++ b/src/build/vpo/do_sprint
@@ -49,7 +49,7 @@
 #                            - Use env variable $HB_VBUTOOLS for VBU tools
 #
 # Version 1.3   06-11-2012   Change "-c3" to "-cft" (first avail core)
-#
+# Version 1.4   07-02-2012   Load SPD data
 ##################################################################################
 
 PGM=`basename $0`
@@ -224,12 +224,14 @@ test $? -eq 0 && vbu_targeting_addr=0x5B0690
 
 set -x
 if [ "$start_after_hbiload" != "--start_after_hbiload" -a "$start_after_hbitest" != "--start_after_hbitest" ]; then
-	siminit ${AUTOVBU_INITIAL_CHKPT-after_8megzero} -quiet || exit 1
+	siminit ${AUTOVBU_INITIAL_CHKPT-zero_vpo_after_proc_sbe} -quiet || exit 1
 fi
 
 if [ "$start_after_hbiload" != "--start_after_hbiload" -a "$start_after_hbitest" != "--start_after_hbitest" ]; then
 	$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMG}/hbicore${use_test}.bin -b ${CORE--cft} || exit 1
 	$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMG}/vbu${use_test}.pnor -o 0x400000 -b ${CORE--cft} || exit 1
+	$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMG}/sysmvpd.dat -o 0x681000 -b ${CORE--cft} || exit 1
+	$HB_VBUTOOLS/p8_load_l3 -l ${DEFAULT_LEVEL-rel} -f ${HB_IMG}/sysspd.dat -o 0x701000 -b ${CORE--cft} || exit 1
 fi
 
 
diff --git a/src/usr/hwas/hwasPlat.C b/src/usr/hwas/hwasPlat.C
index c47a134af..950276993 100644
--- a/src/usr/hwas/hwasPlat.C
+++ b/src/usr/hwas/hwasPlat.C
@@ -49,8 +49,26 @@ errlHndl_t platReadIDEC(const TargetHandle_t &i_target)
     uint64_t id_ec;
     size_t op_size = sizeof(id_ec);
     errlHndl_t errl = NULL;
-    errl = DeviceFW::deviceRead(i_target, &id_ec,
-               op_size, DEVICE_SCOM_ADDRESS(0x000F000Full));
+
+    // At the time when we read IDEC, the tp chiplet of Centaur & slave
+    // processors are not yet enabled; therefore, we can not read IDEC
+    // using SCOM path.  We must use FSI path to read the IDEC values.
+    // For master proc, use scom
+    // For everything else, use FSI(0x1028)
+    TARGETING::Target* l_pMasterProcChip = NULL;
+    TARGETING::targetService(). masterProcChipTargetHandle(l_pMasterProcChip);
+
+    if (i_target == l_pMasterProcChip)
+    {
+        errl = DeviceFW::deviceRead(i_target, &id_ec,
+                                    op_size,
+                                    DEVICE_SCOM_ADDRESS(0x000F000Full));
+    }
+    else
+    {
+        errl = DeviceFW::deviceRead(i_target, &id_ec, op_size,
+                                    DEVICE_FSI_ADDRESS(0x01028));
+    }
 
     if (errl == NULL)
     {   // no error, so we got a valid ID/EC value back
diff --git a/src/usr/pore/makefile b/src/usr/pore/makefile
index 197aac2be..a98318689 100644
--- a/src/usr/pore/makefile
+++ b/src/usr/pore/makefile
@@ -23,7 +23,6 @@
 ROOTPATH = ../../..
 
 SUBDIRS = fapiporeve.d poreve.d test.d
-
-BINARY_FILES = $(IMGDIR)/centaur.sbe_pnor.bin:facd29e899693053b3934798976b2a263a94f229
+BINARY_FILES = $(IMGDIR)/centaur.sbe_pnor.bin:f09e776669b675baa9cd4fa5ad91e0e7d7671f0b
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc b/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc
index 343045533..b0eab9d6a 100755
--- a/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc
+++ b/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc
@@ -25,7 +25,7 @@
 //
 // File generated by hook_indexer
 // Arguments : -g -b centaur.sbe_pnor.out -c bin/sbe_pnor.hooks.cc -m pnor
-// Generation Date : Wed Jun 13 08:16:03 CDT 2012
+// Generation Date : Thu Jul  5 10:52:28 CDT 2012
 
 #include "hookmanager.H"
 
@@ -129,28 +129,28 @@ static const char* symbols[92] = {
 static GlobalSymbolInfo info[92] = {
 {PoreAddress(0x8000, 0x000002c0), 'T'},
 {PoreAddress(0x8000, 0x00000444), 'T'},
-{PoreAddress(0x8000, 0x00000a7c), 'T'},
+{PoreAddress(0x8000, 0x00000aa0), 'T'},
 {PoreAddress(0x800b, 0x00000590), 'T'},
-{PoreAddress(0x8000, 0x000011b8), 'R'},
+{PoreAddress(0x8000, 0x000012e8), 'R'},
 {PoreAddress(0x800b, 0x00000570), 'T'},
 {PoreAddress(0x8000, 0x00000390), 'T'},
-{PoreAddress(0x8000, 0x000005b8), 'T'},
-{PoreAddress(0x8000, 0x00000824), 'T'},
+{PoreAddress(0x8000, 0x000005bc), 'T'},
+{PoreAddress(0x8000, 0x00000788), 'T'},
 {PoreAddress(0x8000, 0x00000258), 'R'},
 {PoreAddress(0x8000, 0x000002dc), 'T'},
-{PoreAddress(0x8000, 0x00000ad8), 'T'},
-{PoreAddress(0x800b, 0x00000918), 'T'},
-{PoreAddress(0x800b, 0x00001010), 'T'},
+{PoreAddress(0x8000, 0x00000afc), 'T'},
+{PoreAddress(0x800b, 0x00000938), 'T'},
+{PoreAddress(0x800b, 0x000010ec), 'T'},
 {PoreAddress(0x800b, 0x000002c0), 'T'},
 {PoreAddress(0x800b, 0x00000248), 'R'},
-{PoreAddress(0x800b, 0x00000ee8), 'T'},
+{PoreAddress(0x800b, 0x00000fcc), 'T'},
 {PoreAddress(0x8000, 0x00000354), 'T'},
-{PoreAddress(0x8000, 0x000010dc), 'T'},
+{PoreAddress(0x8000, 0x000011dc), 'T'},
 {PoreAddress(0x8000, 0x000003cc), 'T'},
 {PoreAddress(0x800b, 0x00000480), 'T'},
-{PoreAddress(0x800b, 0x00000764), 'T'},
+{PoreAddress(0x800b, 0x000006c4), 'T'},
 {PoreAddress(0x8000, 0x00000218), 'R'},
-{PoreAddress(0x8000, 0x00000ef0), 'T'},
+{PoreAddress(0x8000, 0x00000fd4), 'T'},
 {PoreAddress(0x8000, 0x00000200), 'R'},
 {PoreAddress(0x8000, 0x00000210), 'R'},
 {PoreAddress(0x8000, 0x00000220), 'R'},
@@ -158,67 +158,67 @@ static GlobalSymbolInfo info[92] = {
 {PoreAddress(0x800b, 0x00000238), 'R'},
 {PoreAddress(0x800b, 0x00000534), 'T'},
 {PoreAddress(0x8000, 0x00000570), 'T'},
-{PoreAddress(0x800b, 0x00000ee4), 'T'},
-{PoreAddress(0x8000, 0x00000918), 'T'},
-{PoreAddress(0x8000, 0x00001010), 'T'},
+{PoreAddress(0x800b, 0x00000f18), 'T'},
+{PoreAddress(0x8000, 0x00000938), 'T'},
+{PoreAddress(0x8000, 0x000010ec), 'T'},
 {PoreAddress(0x8000, 0x000002c0), 'T'},
 {PoreAddress(0x8000, 0x00000248), 'R'},
-{PoreAddress(0x800b, 0x00000eec), 'T'},
+{PoreAddress(0x800b, 0x00000fd0), 'T'},
 {PoreAddress(0x800b, 0x000002c0), 'T'},
-{PoreAddress(0x800b, 0x00000a7c), 'T'},
+{PoreAddress(0x800b, 0x00000aa0), 'T'},
 {PoreAddress(0x800b, 0x00000390), 'T'},
-{PoreAddress(0x800b, 0x000005b8), 'T'},
-{PoreAddress(0x8000, 0x00000bb8), 'T'},
-{PoreAddress(0x800b, 0x00000824), 'T'},
+{PoreAddress(0x800b, 0x000005bc), 'T'},
+{PoreAddress(0x8000, 0x00000be0), 'T'},
+{PoreAddress(0x800b, 0x00000788), 'T'},
 {PoreAddress(0x800b, 0x00000208), 'R'},
 {PoreAddress(0x800b, 0x000002dc), 'T'},
 {PoreAddress(0x8000, 0x00000408), 'T'},
-{PoreAddress(0x800b, 0x00000ad8), 'T'},
+{PoreAddress(0x800b, 0x00000afc), 'T'},
 {PoreAddress(0x800b, 0x00000240), 'R'},
 {PoreAddress(0x800b, 0x00000354), 'T'},
 {PoreAddress(0x8000, 0x00000534), 'T'},
 {PoreAddress(0x800b, 0x000003cc), 'T'},
-{PoreAddress(0x8000, 0x00000ee4), 'T'},
-{PoreAddress(0x800b, 0x00000ef4), 'T'},
+{PoreAddress(0x8000, 0x00000f18), 'T'},
+{PoreAddress(0x800b, 0x00000fd8), 'T'},
 {PoreAddress(0x800b, 0x00000218), 'R'},
-{PoreAddress(0x8000, 0x00000eec), 'T'},
-{PoreAddress(0x8000, 0x000011a8), 'R'},
+{PoreAddress(0x8000, 0x00000fd0), 'T'},
+{PoreAddress(0x8000, 0x000012d8), 'R'},
 {PoreAddress(0x800b, 0x00000200), 'R'},
 {PoreAddress(0x8000, 0x00000228), 'R'},
 {PoreAddress(0x800b, 0x00000210), 'R'},
 {PoreAddress(0x800b, 0x00000220), 'R'},
 {PoreAddress(0x800b, 0x00000318), 'T'},
-{PoreAddress(0x800b, 0x00000eac), 'T'},
-{PoreAddress(0x8000, 0x000011a8), 'R'},
+{PoreAddress(0x800b, 0x00000ee0), 'T'},
+{PoreAddress(0x8000, 0x000012d8), 'R'},
 {PoreAddress(0x800b, 0x000004bc), 'T'},
 {PoreAddress(0x8000, 0x00000208), 'R'},
 {PoreAddress(0x800b, 0x00000250), 'R'},
 {PoreAddress(0x8000, 0x00000240), 'R'},
-{PoreAddress(0x8000, 0x00000ef4), 'T'},
+{PoreAddress(0x8000, 0x00000fd8), 'T'},
 {PoreAddress(0x800b, 0x00000230), 'R'},
-{PoreAddress(0x800b, 0x00000bb8), 'T'},
+{PoreAddress(0x800b, 0x00000be0), 'T'},
 {PoreAddress(0x800b, 0x00000408), 'T'},
 {PoreAddress(0x8000, 0x00000318), 'T'},
-{PoreAddress(0x8000, 0x00000eac), 'T'},
+{PoreAddress(0x8000, 0x00000ee0), 'T'},
 {PoreAddress(0x8000, 0x000004bc), 'T'},
 {PoreAddress(0x800b, 0x000004f8), 'T'},
-{PoreAddress(0x800b, 0x0000100c), 'T'},
+{PoreAddress(0x800b, 0x000010e8), 'T'},
 {PoreAddress(0x8000, 0x00000250), 'R'},
-{PoreAddress(0x8000, 0x00000ee8), 'T'},
-{PoreAddress(0x800b, 0x000011a8), 'R'},
+{PoreAddress(0x8000, 0x00000fcc), 'T'},
+{PoreAddress(0x800b, 0x000012d8), 'R'},
 {PoreAddress(0x8000, 0x00000480), 'T'},
 {PoreAddress(0x800b, 0x00000228), 'R'},
 {PoreAddress(0x800b, 0x00000444), 'T'},
-{PoreAddress(0x8000, 0x00000764), 'T'},
-{PoreAddress(0x800b, 0x000011b8), 'R'},
+{PoreAddress(0x8000, 0x000006c4), 'T'},
+{PoreAddress(0x800b, 0x000012e8), 'R'},
 {PoreAddress(0x8000, 0x00000230), 'R'},
-{PoreAddress(0x800b, 0x000011a8), 'R'},
+{PoreAddress(0x800b, 0x000012d8), 'R'},
 {PoreAddress(0x800b, 0x00000258), 'R'},
 {PoreAddress(0x8000, 0x00000238), 'R'},
-{PoreAddress(0x800b, 0x000010dc), 'T'},
+{PoreAddress(0x800b, 0x000011dc), 'T'},
 {PoreAddress(0x8000, 0x000004f8), 'T'},
-{PoreAddress(0x8000, 0x0000100c), 'T'},
-{PoreAddress(0x800b, 0x00000ef0), 'T'},
+{PoreAddress(0x8000, 0x000010e8), 'T'},
+{PoreAddress(0x800b, 0x00000fd4), 'T'},
 };
 
 static void
diff --git a/src/usr/targeting/common/xmltohb/vbu.system.xml b/src/usr/targeting/common/xmltohb/vbu.system.xml
index 034e6e08d..cd7bcb19b 100644
--- a/src/usr/targeting/common/xmltohb/vbu.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu.system.xml
@@ -28,6 +28,8 @@
      Contains target instance declarations for the VBU configuration
      ================================================================= -->
 
+<!-- System -->
+
 <targetInstance>
     <id>sys0</id>
     <type>sys-sys-power8</type>
@@ -84,13 +86,14 @@
             <field><id>reserved</id><value>0</value></field>
         </default>
     </attribute>
+    <!-- TODO: These PAYLOAD_BASE/PAYLOAD_ENTRY values is a specific workaround in order to allow Todd's memtester to work. Need to review for all VBU setups. -->
     <attribute>
         <id>PAYLOAD_BASE</id>
-        <default>0x0</default>
+        <default>256</default>
     </attribute>
     <attribute>
         <id>PAYLOAD_ENTRY</id>
-        <default>0x0</default>
+        <default>0x100</default>
     </attribute>
     <attribute>
         <id>MSS_MCA_HASH_MODE</id>
@@ -118,6 +121,8 @@
     </attribute>
 </targetInstance>
 
+<!-- System node 0 -->
+
 <targetInstance>
     <id>sys0node0</id>
     <type>enc-node-power8</type>
@@ -132,11 +137,11 @@
     </attribute>
 </targetInstance>
 
-<!-- Venice n0p0 processor chip -->
+<!-- Murano n0p0 processor chip -->
 
 <targetInstance>
     <id>sys0node0proc0</id>
-    <type>chip-processor-venice</type>
+    <type>chip-processor-murano</type>
     <attribute><id>HUID</id><default>0x00070000</default></attribute>
     <attribute><id>POSITION</id><default>0</default></attribute>
     <attribute><id>SCOM_SWITCHES</id>
@@ -170,69 +175,14 @@
         <id>FABRIC_CHIP_ID</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>0</default></attribute>
 </targetInstance>
 
-<!-- Venice n0p0 EX units -->
-
-<targetInstance>
-    <id>sys0node0proc0ex0</id>
-    <type>unit-ex-venice</type>
-    <attribute><id>HUID</id><default>0x000A0000</default></attribute>
-        <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-0</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex1</id>
-    <type>unit-ex-venice</type>
-    <attribute><id>HUID</id><default>0x000A0001</default></attribute>
-        <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-1</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-1</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex2</id>
-    <type>unit-ex-venice</type>
-    <attribute><id>HUID</id><default>0x000A0002</default></attribute>
-        <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-2</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-2</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex3</id>
-    <type>unit-ex-venice</type>
-    <attribute><id>HUID</id><default>0x000A0003</default></attribute>
-        <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-3</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-3</default>
-    </attribute>
-</targetInstance>
+<!-- Murano n0p0 EX units -->
 
 <targetInstance>
     <id>sys0node0proc0ex4</id>
-    <type>unit-ex-venice</type>
+    <type>unit-ex-murano</type>
     <attribute><id>HUID</id><default>0x000A0004</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -242,13 +192,17 @@
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/ex-4</default>
     </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>4</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
     <id>sys0node0proc0ex5</id>
-    <type>unit-ex-venice</type>
+    <type>unit-ex-murano</type>
     <attribute><id>HUID</id><default>0x000A0005</default></attribute>
-    <attribute>
+        <attribute>
         <id>PHYS_PATH</id>
         <default>physical:sys-0/node-0/proc-0/ex-5</default>
     </attribute>
@@ -256,171 +210,127 @@
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/ex-5</default>
     </attribute>
-</targetInstance>
-
-<!-- Venice n0p0 core units -->
-
-<targetInstance>
-    <id>sys0node0proc0ex0core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0000</default></attribute>
     <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-0/core-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-0/core-0</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex1core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0001</default></attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-1/core-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-1/core-0</default>
+        <id>CHIP_UNIT</id>
+        <default>5</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0ex2core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0002</default></attribute>
-    <attribute>
+    <id>sys0node0proc0ex6</id>
+    <type>unit-ex-murano</type>
+    <attribute><id>HUID</id><default>0x000A0006</default></attribute>
+        <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-2/core-0</default>
+        <default>physical:sys-0/node-0/proc-0/ex-6</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-2/core-0</default>
-    </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex3core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0003</default></attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-3/core-0</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-6</default>
     </attribute>
     <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-3/core-0</default>
+        <id>CHIP_UNIT</id>
+        <default>6</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0ex4core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0004</default></attribute>
-    <attribute>
+    <id>sys0node0proc0ex12</id>
+    <type>unit-ex-murano</type>
+    <attribute><id>HUID</id><default>0x000A000C</default></attribute>
+        <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default>
+        <default>physical:sys-0/node-0/proc-0/ex-12</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-12</default>
     </attribute>
-</targetInstance>
-
-<targetInstance>
-    <id>sys0node0proc0ex5core0</id>
-    <type>unit-core-venice</type>
-    <attribute><id>HUID</id><default>0x000B0005</default></attribute>
     <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default>
+        <id>CHIP_UNIT</id>
+        <default>12</default>
     </attribute>
 </targetInstance>
 
-<!-- Venice n0p0 MCS units -->
-
 <targetInstance>
-    <id>sys0node0proc0mcs0</id>
-    <type>unit-mcs-venice</type>
-    <attribute><id>HUID</id><default>0x000F0000</default></attribute>
-    <attribute>
+    <id>sys0node0proc0ex13</id>
+    <type>unit-ex-murano</type>
+    <attribute><id>HUID</id><default>0x000A000D</default></attribute>
+        <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcs-0</default>
+        <default>physical:sys-0/node-0/proc-0/ex-13</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-13</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>0</default>
+        <default>13</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0mcs1</id>
-    <type>unit-mcs-venice</type>
-    <attribute><id>HUID</id><default>0x000F0001</default></attribute>
+    <id>sys0node0proc0ex14</id>
+    <type>unit-ex-murano</type>
+    <attribute><id>HUID</id><default>0x000A000E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcs-1</default>
+        <default>physical:sys-0/node-0/proc-0/ex-14</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-14</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>1</default>
+        <default>14</default>
     </attribute>
 </targetInstance>
 
+<!-- Murano n0p0 core units -->
+
 <targetInstance>
-    <id>sys0node0proc0mcs2</id>
-    <type>unit-mcs-venice</type>
-    <attribute><id>HUID</id><default>0x000F0002</default></attribute>
+    <id>sys0node0proc0ex4core0</id>
+    <type>unit-core-venice</type>
+    <attribute><id>HUID</id><default>0x000B0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcs-2</default>
+        <default>physical:sys-0/node-0/proc-0/ex-4/core-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-2</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-4/core-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>2</default>
+        <default>5</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0mcs3</id>
-    <type>unit-mcs-venice</type>
-    <attribute><id>HUID</id><default>0x000F0003</default></attribute>
+    <id>sys0node0proc0ex5core0</id>
+    <type>unit-core-murano</type>
+    <attribute><id>HUID</id><default>0x000B0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/mcs-3</default>
+        <default>physical:sys-0/node-0/proc-0/ex-5/core-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-3</default>
+        <default>affinity:sys-0/node-0/proc-0/ex-5/core-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
-        <default>3</default>
+        <default>5</default>
     </attribute>
 </targetInstance>
 
+<!-- Murano n0p0 MCS units -->
+
 <targetInstance>
     <id>sys0node0proc0mcs4</id>
-    <type>unit-mcs-venice</type>
+    <type>unit-mcs-murano</type>
     <attribute><id>HUID</id><default>0x000F0004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -438,7 +348,7 @@
 
 <targetInstance>
     <id>sys0node0proc0mcs5</id>
-    <type>unit-mcs-venice</type>
+    <type>unit-mcs-murano</type>
     <attribute><id>HUID</id><default>0x000F0005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -456,7 +366,7 @@
 
 <targetInstance>
     <id>sys0node0proc0mcs6</id>
-    <type>unit-mcs-venice</type>
+    <type>unit-mcs-murano</type>
     <attribute><id>HUID</id><default>0x000F0006</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -474,7 +384,7 @@
 
 <targetInstance>
     <id>sys0node0proc0mcs7</id>
-    <type>unit-mcs-venice</type>
+    <type>unit-mcs-murano</type>
     <attribute><id>HUID</id><default>0x000F0007</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -490,11 +400,11 @@
     </attribute>
 </targetInstance>
 
-<!-- Venice n0p0 pervasive unit -->
+<!-- Murano n0p0 pervasive unit -->
 
 <targetInstance>
     <id>sys0node0proc0pervasive0</id>
-    <type>unit-pervasive-venice</type>
+    <type>unit-pervasive-murano</type>
     <attribute><id>HUID</id><default>0x00130000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -506,11 +416,11 @@
     </attribute>
 </targetInstance>
 
-<!-- Venice n0p0 powerbus unit -->
+<!-- Murano n0p0 powerbus unit -->
 
 <targetInstance>
     <id>sys0node0proc0powerbus0</id>
-    <type>unit-powerbus-venice</type>
+    <type>unit-powerbus-murano</type>
     <attribute><id>HUID</id><default>0x00140000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -522,11 +432,11 @@
     </attribute>
 </targetInstance>
 
-<!-- Venice n0p0 PCI units -->
+<!-- Murano n0p0 PCI units -->
 
 <targetInstance>
     <id>sys0node0proc0pci0</id>
-    <type>unit-pci-venice</type>
+    <type>unit-pci-murano</type>
     <attribute><id>HUID</id><default>0x00170000</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -536,11 +446,15 @@
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/pci-0</default>
     </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>0</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
     <id>sys0node0proc0pci1</id>
-    <type>unit-pci-venice</type>
+    <type>unit-pci-murano</type>
     <attribute><id>HUID</id><default>0x00170001</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -550,11 +464,15 @@
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/pci-1</default>
     </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>1</default>
+    </attribute>
 </targetInstance>
 
 <targetInstance>
     <id>sys0node0proc0pci2</id>
-    <type>unit-pci-venice</type>
+    <type>unit-pci-murano</type>
     <attribute><id>HUID</id><default>0x00170002</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
@@ -564,14 +482,18 @@
         <id>AFFINITY_PATH</id>
         <default>affinity:sys-0/node-0/proc-0/pci-2</default>
     </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>2</default>
+    </attribute>
 </targetInstance>
 
 
-<!-- Venice n0p0 ABUS units -->
+<!-- Murano n0p0 ABUS units -->
 
 <targetInstance>
     <id>sys0node0proc0abus0</id>
-    <type>unit-abus-venice</type>
+    <type>unit-abus-murano</type>
     <attribute><id>HUID</id><default>0x00160000</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -589,7 +511,7 @@
 
 <targetInstance>
     <id>sys0node0proc0abus1</id>
-    <type>unit-abus-venice</type>
+    <type>unit-abus-murano</type>
     <attribute><id>HUID</id><default>0x00160001</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -607,7 +529,7 @@
 
 <targetInstance>
     <id>sys0node0proc0abus2</id>
-    <type>unit-abus-venice</type>
+    <type>unit-abus-murano</type>
     <attribute><id>HUID</id><default>0x00160002</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -624,11 +546,11 @@
 </targetInstance>
 
 
-<!-- Venice n0p0 XBUS units -->
+<!-- Murano n0p0 XBUS units -->
 
 <targetInstance>
     <id>sys0node0proc0xbus0</id>
-    <type>unit-xbus-venice</type>
+    <type>unit-xbus-murano</type>
     <attribute><id>HUID</id><default>0x00150000</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -646,7 +568,7 @@
 
 <targetInstance>
     <id>sys0node0proc0xbus1</id>
-    <type>unit-xbus-venice</type>
+    <type>unit-xbus-murano</type>
     <attribute><id>HUID</id><default>0x00150001</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -664,7 +586,7 @@
 
 <targetInstance>
     <id>sys0node0proc0xbus2</id>
-    <type>unit-xbus-venice</type>
+    <type>unit-xbus-murano</type>
     <attribute><id>HUID</id><default>0x00150002</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -682,7 +604,7 @@
 
 <targetInstance>
     <id>sys0node0proc0xbus3</id>
-    <type>unit-xbus-venice</type>
+    <type>unit-xbus-murano</type>
     <attribute><id>HUID</id><default>0x00150003</default></attribute>
         <attribute>
         <id>PHYS_PATH</id>
@@ -699,20 +621,20 @@
 </targetInstance>
 
 
-<!-- Centaur n0p0 : start -->
+<!-- Centaur n0p4 : start -->
 
 <targetInstance>
-    <id>sys0node0membuf0</id>
+    <id>sys0node0membuf4</id>
     <type>chip-membuf-centaur</type>
-    <attribute><id>HUID</id><default>0x00060000</default></attribute>
-    <attribute><id>POSITION</id><default>0</default></attribute>
+    <attribute><id>HUID</id><default>0x00060004</default></attribute>
+    <attribute><id>POSITION</id><default>4</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0</default>
+        <default>physical:sys-0/node-0/membuf-4</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4</default>
     </attribute>
 
     <!-- FSI is connected via proc0:cMFSI-0 -->
@@ -738,70 +660,76 @@
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf0 -->
+<!-- Centaur MBS affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0</id>
+    <id>sys0node0membuf4mbs0</id>
     <type>unit-mbs-centaur</type>
-    <attribute><id>HUID</id><default>0x00100000</default></attribute>
+    <attribute><id>HUID</id><default>0x00100004</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-4/mbs-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0</default>
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBAs affiliated with membuf0 -->
+<!-- Centaur MBAs affiliated with membuf4 -->
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0mba0</id>
+    <id>sys0node0membuf4mbs0mba0</id>
     <type>unit-mba-centaur</type>
-    <attribute><id>HUID</id><default>0x00110000</default></attribute>
+    <attribute><id>HUID</id><default>0x00110008</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-0</default>
+        <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>0</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0membuf0mbs0mba1</id>
+    <id>sys0node0membuf4mbs0mba1</id>
     <type>unit-mba-centaur</type>
-    <attribute><id>HUID</id><default>0x00110001</default></attribute>
+    <attribute><id>HUID</id><default>0x00110009</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-0/mbs-0/mba-1</default>
+        <default>physical:sys-0/node-0/membuf-4/mbs-0/mba-1</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>1</default>
     </attribute>
 </targetInstance>
 
-<!-- Centaur n0p0 : end -->
-
+<!-- Centaur n0p4 : end -->
 
-
-<!-- Centaur n0p1 : start -->
+<!-- Centaur n0p5 : start -->
 
 <targetInstance>
-    <id>sys0node0membuf1</id>
+    <id>sys0node0membuf5</id>
     <type>chip-membuf-centaur</type>
-    <attribute><id>HUID</id><default>0x00060001</default></attribute>
-    <attribute><id>POSITION</id><default>1</default></attribute>
+    <attribute><id>HUID</id><default>0x00060005</default></attribute>
+    <attribute><id>POSITION</id><default>5</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1</default>
+        <default>physical:sys-0/node-0/membuf-5</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5</default>
     </attribute>
 
     <!-- FSI is connected via proc0:cMFSI-1 -->
@@ -827,72 +755,80 @@
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBS affiliated with membuf1 -->
+<!-- Centaur MBS affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0</id>
+    <id>sys0node0membuf5mbs0</id>
     <type>unit-mbs-centaur</type>
-    <attribute><id>HUID</id><default>0x00100001</default></attribute>
+    <attribute><id>HUID</id><default>0x00100005</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0</default>
+        <default>physical:sys-0/node-0/membuf-5/mbs-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0</default>
     </attribute>
 </targetInstance>
 
-<!-- Centaur MBAs affiliated with membuf1 -->
+<!-- Centaur MBAs affiliated with membuf5 -->
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0mba0</id>
+    <id>sys0node0membuf5mbs0mba0</id>
     <type>unit-mba-centaur</type>
-    <attribute><id>HUID</id><default>0x00110002</default></attribute>
+    <attribute><id>HUID</id><default>0x0011000A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-0</default>
+        <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>0</default>
     </attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0membuf1mbs0mba1</id>
+    <id>sys0node0membuf5mbs0mba1</id>
     <type>unit-mba-centaur</type>
-    <attribute><id>HUID</id><default>0x00110003</default></attribute>
+    <attribute><id>HUID</id><default>0x0011000B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/membuf-1/mbs-0/mba-1</default>
+        <default>physical:sys-0/node-0/membuf-5/mbs-0/mba-1</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1</default>
+    </attribute>
+    <attribute>
+        <id>CHIP_UNIT</id>
+        <default>1</default>
     </attribute>
 </targetInstance>
 
 <!-- Centaur n0p1 : end -->
 
 <!-- DIMMS
-     id/physical is sys-0/node-0/dimm-[i]
-            where i=[0-255]
+     id/physical is sys-0/node-0/dimm-[d]
+            where d=[0-512]
      affinity    is sys-0/node-0/proc-[i]/mcs-[j]/membuf-0/mbs-0/mba-[k]/mem_port-[l]/dimm-[m]
-            where i=[0] j=[0-1] k=[0-1] l=[0-1] m=[0-1]
+            where i=[0-7] j=[0-7] k=[0-1] l=[0-1] m=[0-1]
 -->
 
 <targetInstance>
-    <id>sys0node0dimm0</id>
+    <id>sys0node0dimm32</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030000</default></attribute>
+    <attribute><id>HUID</id><default>0x00030020</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-0</default>
+        <default>physical:sys-0/node-0/dimm-32</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0/mem_port-0/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -902,19 +838,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>32</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm1</id>
+    <id>sys0node0dimm33</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030001</default></attribute>
+    <attribute><id>HUID</id><default>0x00030021</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-1</default>
+        <default>physical:sys-0/node-0/dimm-33</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0/mem_port-0/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -924,19 +861,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>33</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm2</id>
+    <id>sys0node0dimm34</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030002</default></attribute>
+    <attribute><id>HUID</id><default>0x00030022</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-2</default>
+        <default>physical:sys-0/node-0/dimm-34</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0/mem_port-1/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -946,19 +884,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>34</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm3</id>
+    <id>sys0node0dimm35</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030003</default></attribute>
+    <attribute><id>HUID</id><default>0x00030023</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-3</default>
+        <default>physical:sys-0/node-0/dimm-35</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-0/mem_port-1/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -968,19 +907,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>35</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm4</id>
+    <id>sys0node0dimm36</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030004</default></attribute>
+    <attribute><id>HUID</id><default>0x00030024</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-4</default>
+        <default>physical:sys-0/node-0/dimm-36</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1/mem_port-0/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -990,19 +930,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>36</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm5</id>
+    <id>sys0node0dimm37</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030005</default></attribute>
+    <attribute><id>HUID</id><default>0x00030025</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-5</default>
+        <default>physical:sys-0/node-0/dimm-37</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1/mem_port-0/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1012,19 +953,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>37</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm6</id>
+    <id>sys0node0dimm38</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030006</default></attribute>
+    <attribute><id>HUID</id><default>0x00030026</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-6</default>
+        <default>physical:sys-0/node-0/dimm-38</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1/mem_port-1/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1034,19 +976,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>38</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm7</id>
+    <id>sys0node0dimm39</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030007</default></attribute>
+    <attribute><id>HUID</id><default>0x00030027</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-7</default>
+        <default>physical:sys-0/node-0/dimm-39</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-0/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-4/membuf-4/mbs-0/mba-1/mem_port-1/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1056,19 +999,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>39</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm8</id>
+    <id>sys0node0dimm40</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030008</default></attribute>
+    <attribute><id>HUID</id><default>0x00030028</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-8</default>
+        <default>physical:sys-0/node-0/dimm-40</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0/mem_port-0/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1078,19 +1022,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>40</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm9</id>
+    <id>sys0node0dimm41</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x00030009</default></attribute>
+    <attribute><id>HUID</id><default>0x00030029</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-9</default>
+        <default>physical:sys-0/node-0/dimm-41</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-0/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0/mem_port-0/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1100,19 +1045,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>41</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm10</id>
+    <id>sys0node0dimm42</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000A</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002A</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-10</default>
+        <default>physical:sys-0/node-0/dimm-42</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0/mem_port-1/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1122,19 +1068,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>42</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm11</id>
+    <id>sys0node0dimm43</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000B</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002B</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-11</default>
+        <default>physical:sys-0/node-0/dimm-43</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-0/mem_port-1/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-0/mem_port-1/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1144,19 +1091,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>43</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm12</id>
+    <id>sys0node0dimm44</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000C</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002C</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-12</default>
+        <default>physical:sys-0/node-0/dimm-44</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1/mem_port-0/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1166,19 +1114,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>44</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm13</id>
+    <id>sys0node0dimm45</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000D</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002D</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-13</default>
+        <default>physical:sys-0/node-0/dimm-45</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-0/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1/mem_port-0/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1188,19 +1137,20 @@
         <id>MBA_PORT</id>
         <default>0</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>45</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm14</id>
+    <id>sys0node0dimm46</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000E</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002E</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-14</default>
+        <default>physical:sys-0/node-0/dimm-46</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-0</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1/mem_port-1/dimm-0</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1210,19 +1160,20 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>46</default></attribute>
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0dimm15</id>
+    <id>sys0node0dimm47</id>
     <type>lcard-dimm-jedec</type>
-    <attribute><id>HUID</id><default>0x0003000F</default></attribute>
+    <attribute><id>HUID</id><default>0x0003002F</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/dimm-15</default>
+        <default>physical:sys-0/node-0/dimm-47</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/mcs-1/membuf-0/mbs-0/mba-1/mem_port-1/dimm-1</default>
+        <default>affinity:sys-0/node-0/proc-0/mcs-5/membuf-5/mbs-0/mba-1/mem_port-1/dimm-1</default>
     </attribute>
     <attribute>
         <id>MBA_DIMM</id>
@@ -1232,6 +1183,7 @@
         <id>MBA_PORT</id>
         <default>1</default>
     </attribute>
+    <attribute><id>VPD_REC_NUM</id><default>47</default></attribute>
 </targetInstance>
 
 </attributes>