Enable cen_sbe_tp_chiplet_init1 run

Disable run in Simics to avoid build break

RTC 42926

Change-Id: I1f63504362254fa3c90f25cbea118aff35cff153
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1196
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 174 insertions, 156 deletions

diff --git a/src/usr/pore/makefile b/src/usr/pore/makefile
index 63916ff46..197aac2be 100644
--- a/src/usr/pore/makefile
+++ b/src/usr/pore/makefile
@@ -1,11 +1,11 @@
-#  IBM_PROLOG_BEGIN_TAG
+#   IBM_PROLOG_BEGIN_TAG
 #  This is an automatically generated prolog.
 #
-#  $Source: src/usr/xscom/makefile $
+#  $Source: src/usr/pore/makefile $
 #
 #  IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+#  COPYRIGHT International Business Machines Corp. 2011-2012
 #
 #  p1
 #
@@ -19,11 +19,11 @@
 #
 #  Origin: 30
 #
-#  IBM_PROLOG_END
+#  IBM_PROLOG_END_TAG
 ROOTPATH = ../../..
 
 SUBDIRS = fapiporeve.d poreve.d test.d
 
-BINARY_FILES = $(IMGDIR)/sbe_pnor.bin:8f6722020041c1b724f0238a34c1c445a2aa7cce
+BINARY_FILES = $(IMGDIR)/centaur.sbe_pnor.bin:facd29e899693053b3934798976b2a263a94f229
 
 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 ad100cbb6..343045533 100755
--- a/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc
+++ b/src/usr/pore/poreve/hook/sbe_pnor.hooks.cc
@@ -1,39 +1,42 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/pore/poreve/hook/sbe_pnor.hooks.cc $
-//
-//  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
+/*  IBM_PROLOG_BEGIN_TAG
+ *  This is an automatically generated prolog.
+ *
+ *  $Source: src/usr/pore/poreve/hook/sbe_pnor.hooks.cc $
+ *
+ *  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
+ */
 // $Id$
 //
 // File generated by hook_indexer
-// Arguments : -g -b bin/sbe_pnor.out -c bin/sbe_pnor.hooks.cc -m pnor
-// Generation Date : Thu Feb  9 13:47:52 EST 2012
+// 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
 
 #include "hookmanager.H"
 
 using namespace vsbe;
 
-static const char* symbols[84] = {
+static const char* symbols[92] = {
 "oci::cen_sbe_istep_pnor",
 "oci::return_from_cen_sbe_arrayinit",
 "oci::cen_sbe_tp_arrayinit",
+"pnor::_cen_sbe_seeprom_halt",
+"oci::cen_sbe_dd10_tp_bndy_pll_ring",
 "pnor::return_from_cen_sbe_scominits",
 "oci::return_from_cen_sbe_tp_arrayinit",
 "oci::cen_sbe_tp_chiplet_init1",
@@ -41,32 +44,36 @@ static const char* symbols[84] = {
 "oci::cen_sbe_scominits_control",
 "oci::return_from_cen_sbe_tp_chiplet_init1",
 "oci::cen_sbe_tp_chiplet_init3",
+"pnor::cen_array_init_module",
+"pnor::callproc_prologue",
 "pnor::_sbe_pnor_start",
 "pnor::cen_sbe_do_manual_inits_control",
 "pnor::cen_sbe_dts_init",
 "oci::return_from_cen_sbe_tp_chiplet_init2",
+"oci::callproc_epilogue",
 "oci::return_from_cen_sbe_tp_chiplet_init3",
 "pnor::return_from_cen_sbe_dts_init",
 "pnor::cen_scan0_module",
-"oci::cen_sbe_do_manual_inits",
 "oci::cen_sbe_tp_arrayinit_control",
+"oci::cen_sbe_do_manual_inits",
 "oci::cen_sbe_tp_chiplet_init1_control",
 "oci::cen_sbe_tp_chiplet_init2_control",
 "oci::cen_sbe_tp_chiplet_init3_control",
+"oci::_cen_sbe_seeprom_halt",
 "pnor::cen_sbe_dts_init_control",
 "pnor::return_from_cen_sbe_startclocks",
 "oci::return_from_cen_sbe_scominits",
 "pnor::cen_sbe_pll_initf",
+"oci::cen_array_init_module",
+"oci::callproc_prologue",
 "oci::_sbe_pnor_start",
 "oci::cen_sbe_do_manual_inits_control",
 "pnor::cen_sbe_initf",
-"oci::cen_sbe_do_scom_manual_inits",
 "pnor::cen_sbe_istep_pnor",
-"oci::return_from_cen_sbe_do_scom_manual_inits",
 "pnor::cen_sbe_tp_arrayinit",
 "pnor::return_from_cen_sbe_tp_arrayinit",
-"oci::cen_sbe_chiplet_init",
 "pnor::cen_sbe_tp_chiplet_init1",
+"oci::cen_sbe_chiplet_init",
 "pnor::cen_sbe_tp_chiplet_init2",
 "pnor::cen_sbe_pll_initf_control",
 "pnor::return_from_cen_sbe_tp_chiplet_init1",
@@ -75,133 +82,143 @@ static const char* symbols[84] = {
 "pnor::cen_sbe_initf_control",
 "pnor::return_from_cen_sbe_tp_chiplet_init2",
 "oci::return_from_cen_sbe_startclocks",
-"oci::cen_sbe_do_scom_manual_inits_control",
 "pnor::return_from_cen_sbe_tp_chiplet_init3",
 "oci::cen_sbe_pll_initf",
 "pnor::cen_sbe_startclocks",
-"oci::cen_sbe_initf",
 "pnor::cen_sbe_tp_arrayinit_control",
-"oci::cen_sbe_chiplet_init_control",
+"oci::cen_sbe_initf",
+"oci::cen_sbe_tp_bndy_pll_ring_loc",
 "pnor::cen_sbe_tp_chiplet_init1_control",
+"oci::cen_sbe_chiplet_init_control",
 "pnor::cen_sbe_tp_chiplet_init2_control",
 "pnor::cen_sbe_tp_chiplet_init3_control",
 "pnor::return_from_cen_sbe_pll_initf",
 "pnor::cen_sbe_arrayinit",
+"oci::cen_sbe_ring_table",
 "pnor::return_from_cen_sbe_initf",
 "oci::cen_sbe_pll_initf_control",
 "pnor::cen_sbe_startclocks_control",
 "oci::cen_sbe_initf_control",
-"pnor::cen_sbe_do_scom_manual_inits",
-"pnor::return_from_cen_sbe_do_scom_manual_inits",
 "oci::cen_sbe_startclocks",
 "pnor::cen_sbe_arrayinit_control",
 "pnor::cen_sbe_chiplet_init",
 "pnor::return_from_cen_sbe_chiplet_init",
 "oci::return_from_cen_sbe_pll_initf",
 "oci::cen_sbe_arrayinit",
-"pnor::cen_sbe_do_scom_manual_inits_control",
 "oci::return_from_cen_sbe_initf",
 "pnor::return_from_cen_sbe_do_manual_inits",
 "pnor::cen_sbe_scominits",
 "oci::cen_sbe_startclocks_control",
 "oci::cen_sbe_dts_init",
+"pnor::cen_sbe_tp_bndy_pll_ring_loc",
 "oci::return_from_cen_sbe_dts_init",
 "pnor::cen_sbe_chiplet_init_control",
 "pnor::return_from_cen_sbe_arrayinit",
 "oci::cen_scan0_module",
+"pnor::cen_sbe_dd10_tp_bndy_pll_ring",
 "oci::cen_sbe_arrayinit_control",
+"pnor::cen_sbe_ring_table",
 "pnor::cen_sbe_scominits_control",
 "oci::cen_sbe_dts_init_control",
+"pnor::callproc_epilogue",
 "oci::return_from_cen_sbe_do_manual_inits",
 "oci::cen_sbe_scominits",
 "pnor::cen_sbe_do_manual_inits",
 };
 
-static GlobalSymbolInfo info[84] = {
-{PoreAddress(0x8000, 0x00000c00), 'T'},
-{PoreAddress(0x8000, 0x00000fb0), 'T'},
-{PoreAddress(0x8000, 0x00001784), 'T'},
-{PoreAddress(0x800b, 0x000013a0), 'T'},
-{PoreAddress(0x8000, 0x00000d10), 'T'},
-{PoreAddress(0x8000, 0x00001554), 'T'},
-{PoreAddress(0x8000, 0x000016c8), 'T'},
-{PoreAddress(0x8000, 0x000001d8), 'R'},
-{PoreAddress(0x8000, 0x00000c68), 'T'},
-{PoreAddress(0x8000, 0x00001884), 'T'},
-{PoreAddress(0x800b, 0x00000c00), 'T'},
-{PoreAddress(0x800b, 0x000001c8), 'R'},
-{PoreAddress(0x800b, 0x00001cb0), 'T'},
-{PoreAddress(0x8000, 0x00000db8), 'T'},
-{PoreAddress(0x8000, 0x00000e60), 'T'},
-{PoreAddress(0x800b, 0x00001100), 'T'},
-{PoreAddress(0x800b, 0x0000148c), 'T'},
-{PoreAddress(0x8000, 0x00001cc8), 'T'},
-{PoreAddress(0x8000, 0x00000190), 'R'},
-{PoreAddress(0x8000, 0x00000180), 'R'},
-{PoreAddress(0x8000, 0x00000188), 'R'},
-{PoreAddress(0x8000, 0x00000198), 'R'},
-{PoreAddress(0x800b, 0x000001b8), 'R'},
-{PoreAddress(0x800b, 0x000012f8), 'T'},
-{PoreAddress(0x8000, 0x000013a0), 'T'},
-{PoreAddress(0x800b, 0x00001c9c), 'T'},
-{PoreAddress(0x8000, 0x00000c00), 'T'},
-{PoreAddress(0x8000, 0x000001c8), 'R'},
-{PoreAddress(0x800b, 0x00001cbc), 'T'},
-{PoreAddress(0x8000, 0x00001dd4), 'T'},
-{PoreAddress(0x800b, 0x00000c00), 'T'},
-{PoreAddress(0x8000, 0x00001448), 'T'},
-{PoreAddress(0x800b, 0x00001784), 'T'},
-{PoreAddress(0x800b, 0x00000d10), 'T'},
-{PoreAddress(0x8000, 0x00001938), 'T'},
-{PoreAddress(0x800b, 0x00001554), 'T'},
-{PoreAddress(0x800b, 0x000016c8), 'T'},
-{PoreAddress(0x800b, 0x000001b0), 'R'},
-{PoreAddress(0x800b, 0x00000c68), 'T'},
-{PoreAddress(0x8000, 0x00000f08), 'T'},
-{PoreAddress(0x800b, 0x00001884), 'T'},
-{PoreAddress(0x800b, 0x000001c0), 'R'},
-{PoreAddress(0x800b, 0x00000db8), 'T'},
-{PoreAddress(0x8000, 0x000012f8), 'T'},
-{PoreAddress(0x8000, 0x000001e0), 'R'},
-{PoreAddress(0x800b, 0x00000e60), 'T'},
-{PoreAddress(0x8000, 0x00001c9c), 'T'},
-{PoreAddress(0x800b, 0x00001cd4), 'T'},
-{PoreAddress(0x8000, 0x00001cbc), 'T'},
-{PoreAddress(0x800b, 0x00000190), 'R'},
-{PoreAddress(0x8000, 0x000001a0), 'R'},
-{PoreAddress(0x800b, 0x00000180), 'R'},
-{PoreAddress(0x800b, 0x00000188), 'R'},
-{PoreAddress(0x800b, 0x00000198), 'R'},
-{PoreAddress(0x800b, 0x00001058), 'T'},
-{PoreAddress(0x800b, 0x00001b94), 'T'},
-{PoreAddress(0x800b, 0x000011a8), 'T'},
-{PoreAddress(0x8000, 0x000001b0), 'R'},
-{PoreAddress(0x800b, 0x000001d0), 'R'},
-{PoreAddress(0x8000, 0x000001c0), 'R'},
-{PoreAddress(0x800b, 0x00001dd4), 'T'},
-{PoreAddress(0x800b, 0x00001448), 'T'},
-{PoreAddress(0x8000, 0x00001cd4), 'T'},
-{PoreAddress(0x800b, 0x000001a8), 'R'},
-{PoreAddress(0x800b, 0x00001938), 'T'},
-{PoreAddress(0x800b, 0x00000f08), 'T'},
-{PoreAddress(0x8000, 0x00001058), 'T'},
-{PoreAddress(0x8000, 0x00001b94), 'T'},
-{PoreAddress(0x800b, 0x000001e0), 'R'},
-{PoreAddress(0x8000, 0x000011a8), 'T'},
-{PoreAddress(0x800b, 0x00001250), 'T'},
-{PoreAddress(0x800b, 0x00001dc8), 'T'},
-{PoreAddress(0x8000, 0x000001d0), 'R'},
-{PoreAddress(0x8000, 0x00001cb0), 'T'},
-{PoreAddress(0x8000, 0x00001100), 'T'},
-{PoreAddress(0x800b, 0x000001a0), 'R'},
-{PoreAddress(0x800b, 0x00000fb0), 'T'},
-{PoreAddress(0x8000, 0x0000148c), 'T'},
-{PoreAddress(0x8000, 0x000001a8), 'R'},
-{PoreAddress(0x800b, 0x000001d8), 'R'},
-{PoreAddress(0x8000, 0x000001b8), 'R'},
-{PoreAddress(0x8000, 0x00001250), 'T'},
-{PoreAddress(0x8000, 0x00001dc8), 'T'},
-{PoreAddress(0x800b, 0x00001cc8), 'T'},
+static GlobalSymbolInfo info[92] = {
+{PoreAddress(0x8000, 0x000002c0), 'T'},
+{PoreAddress(0x8000, 0x00000444), 'T'},
+{PoreAddress(0x8000, 0x00000a7c), 'T'},
+{PoreAddress(0x800b, 0x00000590), 'T'},
+{PoreAddress(0x8000, 0x000011b8), 'R'},
+{PoreAddress(0x800b, 0x00000570), 'T'},
+{PoreAddress(0x8000, 0x00000390), 'T'},
+{PoreAddress(0x8000, 0x000005b8), 'T'},
+{PoreAddress(0x8000, 0x00000824), 'T'},
+{PoreAddress(0x8000, 0x00000258), 'R'},
+{PoreAddress(0x8000, 0x000002dc), 'T'},
+{PoreAddress(0x8000, 0x00000ad8), 'T'},
+{PoreAddress(0x800b, 0x00000918), 'T'},
+{PoreAddress(0x800b, 0x00001010), 'T'},
+{PoreAddress(0x800b, 0x000002c0), 'T'},
+{PoreAddress(0x800b, 0x00000248), 'R'},
+{PoreAddress(0x800b, 0x00000ee8), 'T'},
+{PoreAddress(0x8000, 0x00000354), 'T'},
+{PoreAddress(0x8000, 0x000010dc), 'T'},
+{PoreAddress(0x8000, 0x000003cc), 'T'},
+{PoreAddress(0x800b, 0x00000480), 'T'},
+{PoreAddress(0x800b, 0x00000764), 'T'},
+{PoreAddress(0x8000, 0x00000218), 'R'},
+{PoreAddress(0x8000, 0x00000ef0), 'T'},
+{PoreAddress(0x8000, 0x00000200), 'R'},
+{PoreAddress(0x8000, 0x00000210), 'R'},
+{PoreAddress(0x8000, 0x00000220), 'R'},
+{PoreAddress(0x8000, 0x00000590), 'T'},
+{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(0x8000, 0x000002c0), 'T'},
+{PoreAddress(0x8000, 0x00000248), 'R'},
+{PoreAddress(0x800b, 0x00000eec), 'T'},
+{PoreAddress(0x800b, 0x000002c0), 'T'},
+{PoreAddress(0x800b, 0x00000a7c), 'T'},
+{PoreAddress(0x800b, 0x00000390), 'T'},
+{PoreAddress(0x800b, 0x000005b8), 'T'},
+{PoreAddress(0x8000, 0x00000bb8), 'T'},
+{PoreAddress(0x800b, 0x00000824), 'T'},
+{PoreAddress(0x800b, 0x00000208), 'R'},
+{PoreAddress(0x800b, 0x000002dc), 'T'},
+{PoreAddress(0x8000, 0x00000408), 'T'},
+{PoreAddress(0x800b, 0x00000ad8), '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(0x800b, 0x00000218), 'R'},
+{PoreAddress(0x8000, 0x00000eec), 'T'},
+{PoreAddress(0x8000, 0x000011a8), '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, 0x000004bc), 'T'},
+{PoreAddress(0x8000, 0x00000208), 'R'},
+{PoreAddress(0x800b, 0x00000250), 'R'},
+{PoreAddress(0x8000, 0x00000240), 'R'},
+{PoreAddress(0x8000, 0x00000ef4), 'T'},
+{PoreAddress(0x800b, 0x00000230), 'R'},
+{PoreAddress(0x800b, 0x00000bb8), 'T'},
+{PoreAddress(0x800b, 0x00000408), 'T'},
+{PoreAddress(0x8000, 0x00000318), 'T'},
+{PoreAddress(0x8000, 0x00000eac), 'T'},
+{PoreAddress(0x8000, 0x000004bc), 'T'},
+{PoreAddress(0x800b, 0x000004f8), 'T'},
+{PoreAddress(0x800b, 0x0000100c), 'T'},
+{PoreAddress(0x8000, 0x00000250), 'R'},
+{PoreAddress(0x8000, 0x00000ee8), 'T'},
+{PoreAddress(0x800b, 0x000011a8), 'R'},
+{PoreAddress(0x8000, 0x00000480), 'T'},
+{PoreAddress(0x800b, 0x00000228), 'R'},
+{PoreAddress(0x800b, 0x00000444), 'T'},
+{PoreAddress(0x8000, 0x00000764), 'T'},
+{PoreAddress(0x800b, 0x000011b8), 'R'},
+{PoreAddress(0x8000, 0x00000230), 'R'},
+{PoreAddress(0x800b, 0x000011a8), 'R'},
+{PoreAddress(0x800b, 0x00000258), 'R'},
+{PoreAddress(0x8000, 0x00000238), 'R'},
+{PoreAddress(0x800b, 0x000010dc), 'T'},
+{PoreAddress(0x8000, 0x000004f8), 'T'},
+{PoreAddress(0x8000, 0x0000100c), 'T'},
+{PoreAddress(0x800b, 0x00000ef0), 'T'},
 };
 
 static void
@@ -209,8 +226,8 @@ init()
 {
 int i;
 FAPI_INF("HookManager : "
-         "Indexing global symbols for bin/sbe_pnor.out");
-for (i = 0; i < 84; i++) {
+         "Indexing global symbols for centaur.sbe_pnor.out");
+for (i = 0; i < 92; i++) {
     HookManager::registerGlobalSymbol(symbols[i], &(info[i]));
 }
 }
diff --git a/src/usr/pore/test/poretest.H b/src/usr/pore/test/poretest.H
index fd0af5e96..233fabb21 100644
--- a/src/usr/pore/test/poretest.H
+++ b/src/usr/pore/test/poretest.H
@@ -1,25 +1,26 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/usr/pore/test/poretest.H $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2011
-//
-//  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
+/*  IBM_PROLOG_BEGIN_TAG
+ *  This is an automatically generated prolog.
+ *
+ *  $Source: src/usr/pore/test/poretest.H $
+ *
+ *  IBM CONFIDENTIAL
+ *
+ *  COPYRIGHT International Business Machines Corp. 2011-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
+ */
 #ifndef __PORETEST_H
 #define __PORETEST_H
 
@@ -69,20 +70,20 @@ public:
         do
         {
             // Loading sbe_pnor img
-            l_errl = VFS::module_load("sbe_pnor.bin");
+            l_errl = VFS::module_load("centaur.sbe_pnor.bin");
             if (l_errl)
             {
-                TS_FAIL("testPore1: Error loading sbe_pnor.bin!");
+                TS_FAIL("testPore1: Error loading centaur.sbe_pnor.bin!");
                 break;
             }
             else
             {
                 // Set flag to unload
                 l_unloadSbePnorImg = true;
-                l_errl = VFS::module_address("sbe_pnor.bin", l_sbePnorAddr, l_sbePnorSize);
+                l_errl = VFS::module_address("centaur.sbe_pnor.bin", l_sbePnorAddr, l_sbePnorSize);
                 if(l_errl)
                 {
-                    TS_FAIL("testPore1: Error getting load address of sbe_pnor.bin!");
+                    TS_FAIL("testPore1: Error getting load address of centaur.sbe_pnor.bin!");
                     break;
                 }
                 else
@@ -90,7 +91,7 @@ public:
                     char l_header[10];
                     memcpy (l_header, l_sbePnorAddr, 9);
                     l_header[9] = '\0';
-                    FAPI_INF("testPore1:Loading sbe_pnor.bin, Addr 0x%llX, Size %d, Header %s",
+                    FAPI_INF("testPore1:Loading centaur.sbe_pnor.bin, Addr 0x%llX, Size %d, Header %s",
                               l_sbePnorAddr, l_sbePnorSize, l_header);
                 }
             }
@@ -224,11 +225,11 @@ public:
         // Unload sbe_pnor
         if (l_unloadSbePnorImg == true)
         {
-            l_rc2 = fapiUnloadInitFile("sbe_pnor.bin", l_sbePnorAddr,
+            l_rc2 = fapiUnloadInitFile("centaur.sbe_pnor.bin", l_sbePnorAddr,
                                        l_sbePnorSize);
             if (l_rc2 != fapi::FAPI_RC_SUCCESS)
             {
-                 FAPI_ERR("testPore1: Error unloading sbe_pnor.bin");
+                 FAPI_ERR("testPore1: Error unloading centaur.sbe_pnor.bin");
                  if (l_rc == fapi::FAPI_RC_SUCCESS)
                  {
                      l_rc = l_rc2;