P9 Cumulus InitCompiler supports - Part 2

  Rename Nimbus only initfiles to p9n.xxx.initfile
  Update scan_procedures.mk, generate_wrapper.pl to support new names.
  Update initfiles.mk to take in p9c chip type

Change-Id: I6aeb04999c6c140f6347ce24f1ce47bffb8990f4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40782
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40783
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

23 files changed, 91 insertions, 91 deletions

diff --git a/src/import/chips/p9/initfiles/p9.mc.scan.initfile b/src/import/chips/p9/initfiles/p9n.mc.scan.initfile
index a24ad150c..a24ad150c 100644
--- a/src/import/chips/p9/initfiles/p9.mc.scan.initfile
+++ b/src/import/chips/p9/initfiles/p9n.mc.scan.initfile
diff --git a/src/import/chips/p9/initfiles/p9.mca.scom.initfile b/src/import/chips/p9/initfiles/p9n.mca.scom.initfile
index 4ff487428..4ff487428 100644
--- a/src/import/chips/p9/initfiles/p9.mca.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9n.mca.scom.initfile
diff --git a/src/import/chips/p9/initfiles/p9.mcbist.scom.initfile b/src/import/chips/p9/initfiles/p9n.mcbist.scom.initfile
index 632329049..632329049 100644
--- a/src/import/chips/p9/initfiles/p9.mcbist.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9n.mcbist.scom.initfile
diff --git a/src/import/chips/p9/initfiles/p9.mcs.scom.initfile b/src/import/chips/p9/initfiles/p9n.mcs.scom.initfile
index fed1a82d5..fed1a82d5 100644
--- a/src/import/chips/p9/initfiles/p9.mcs.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9n.mcs.scom.initfile
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C
index 0a8b0e8cd..d9759dd7e 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.C $ */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.C $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include "p9_ddrphy_scom.H"
+#include "p9n_ddrphy_scom.H"
 #include <stdint.h>
 #include <stddef.h>
 #include <fapi2.H>
@@ -46,8 +46,8 @@ constexpr uint64_t literal_0x4040 = 0x4040;
 constexpr uint64_t literal_0xE058 = 0xE058;
 constexpr uint64_t literal_0x0202 = 0x0202;
 
-fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
-                                 const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
+fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
+                                  const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1)
 {
     {
         fapi2::ATTR_EC_Type   l_chip_ec;
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.H
index aed666a38..dc23f6bf9 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.H $ */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,8 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#ifndef _INIT_P9_DDRPHY_SCOM_PROCEDURE_H_
-#define _INIT_P9_DDRPHY_SCOM_PROCEDURE_H_
+#ifndef _INIT_P9N_DDRPHY_SCOM_PROCEDURE_H_
+#define _INIT_P9N_DDRPHY_SCOM_PROCEDURE_H_
 
 
 #include <stddef.h>
@@ -31,14 +31,14 @@
 #include <fapi2.H>
 
 
-typedef fapi2::ReturnCode (*p9_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
+typedef fapi2::ReturnCode (*p9n_ddrphy_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
         const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
-                                     const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);
+    fapi2::ReturnCode p9n_ddrphy_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
+                                      const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.mk b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.mk
index bd0e3a9cc..73786a2c2 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_ddrphy_scom.mk $
+# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_ddrphy_scom.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2017
 # [+] International Business Machines Corp.
 #
 #
@@ -22,6 +22,6 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-PROCEDURE=p9_ddrphy_scom
+PROCEDURE=p9n_ddrphy_scom
 lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
 $(call BUILD_PROCEDURE)
\ No newline at end of file
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C
index 8a8984c3c..db9779af5 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.C $   */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C $  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include "p9_mc_scan.H"
+#include "p9n_mc_scan.H"
 #include <stdint.h>
 #include <stddef.h>
 #include <fapi2.H>
@@ -34,7 +34,7 @@ constexpr uint64_t literal_8 = 8;
 constexpr uint64_t literal_0b1 = 0b1;
 constexpr uint64_t literal_1 = 1;
 
-fapi2::ReturnCode p9_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0)
+fapi2::ReturnCode p9n_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0)
 {
     {
         fapi2::ATTR_EC_Type   l_chip_ec;
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.H b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.H
index 23480ea16..9c1ad5f46 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.H $   */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.H $  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,8 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#ifndef _INIT_P9_MC_SCAN_PROCEDURE_H_
-#define _INIT_P9_MC_SCAN_PROCEDURE_H_
+#ifndef _INIT_P9N_MC_SCAN_PROCEDURE_H_
+#define _INIT_P9N_MC_SCAN_PROCEDURE_H_
 
 
 #include <stddef.h>
@@ -32,15 +32,15 @@
 
 #ifdef IFCOMPILER_PLAT
 #define INITFILE_PROCEDURE \
-    p9_mc_scan(TGT0);
+    p9n_mc_scan(TGT0);
 #endif
 
-typedef fapi2::ReturnCode (*p9_mc_scan_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
+typedef fapi2::ReturnCode (*p9n_mc_scan_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0);
+    fapi2::ReturnCode p9n_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT0);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.mk b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.mk
index 964da4330..089c7b15a 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mc_scan.mk $
+# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2017
 # [+] International Business Machines Corp.
 #
 #
@@ -22,15 +22,15 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-PROCEDURE=p9_mc_scan
+PROCEDURE=p9n_mc_scan
 lib$(PROCEDURE)_COMMONFLAGS+=-DFAPI_SUPPORT_SPY_AS_STRING=1
 $(call BUILD_PROCEDURE)
 
-PROCEDURE=p9_mc_scan_ifCompiler
+PROCEDURE=p9n_mc_scan_ifCompiler
 lib$(PROCEDURE)_COMMONFLAGS+=-DFAPI_SUPPORT_SPY_AS_STRING=1
 lib$(PROCEDURE)_COMMONFLAGS+=-DIFCOMPILER_PLAT=1
 FAPI=2_IFCOMPILER
-OBJS+=p9_mc_scan.o
+OBJS+=p9n_mc_scan.o
 lib$(PROCEDURE)_LIBPATH=$(LIBPATH)/ifCompiler
 lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
 $(call BUILD_PROCEDURE)
\ No newline at end of file
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
index 6edd8dd51..2985ba95d 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.C $  */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include "p9_mca_scom.H"
+#include "p9n_mca_scom.H"
 #include <stdint.h>
 #include <stddef.h>
 #include <fapi2.H>
@@ -91,9 +91,9 @@ constexpr uint64_t literal_1084 = 1084;
 constexpr uint64_t literal_1143 = 1143;
 constexpr uint64_t literal_1385 = 1385;
 
-fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
-                              const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
-                              const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4)
+fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
+                               const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
+                               const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4)
 {
     {
         fapi2::ATTR_EC_Type   l_chip_ec;
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.H
index 974c54cd0..19046bd39 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.H $  */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,8 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#ifndef _INIT_P9_MCA_SCOM_PROCEDURE_H_
-#define _INIT_P9_MCA_SCOM_PROCEDURE_H_
+#ifndef _INIT_P9N_MCA_SCOM_PROCEDURE_H_
+#define _INIT_P9N_MCA_SCOM_PROCEDURE_H_
 
 
 #include <stddef.h>
@@ -31,16 +31,16 @@
 #include <fapi2.H>
 
 
-typedef fapi2::ReturnCode (*p9_mca_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
+typedef fapi2::ReturnCode (*p9n_mca_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCA>&,
         const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&, const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
         const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
-                                  const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
-                                  const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4);
+    fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
+                                   const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
+                                   const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT3, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT4);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.mk b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.mk
index 62fa90220..411c59365 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.mk $
+# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2017
 # [+] International Business Machines Corp.
 #
 #
@@ -22,6 +22,6 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-PROCEDURE=p9_mcs_scom
+PROCEDURE=p9n_mca_scom
 lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
 $(call BUILD_PROCEDURE)
\ No newline at end of file
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.C
index 3f6eb53a1..0b59dfafd 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.C $ */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.C $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include "p9_mcbist_scom.H"
+#include "p9n_mcbist_scom.H"
 #include <stdint.h>
 #include <stddef.h>
 #include <fapi2.H>
@@ -41,7 +41,7 @@ constexpr uint64_t literal_0b00001000000000000000 = 0b00001000000000000000;
 constexpr uint64_t literal_0b100 = 0b100;
 constexpr uint64_t literal_0b0100 = 0b0100;
 
-fapi2::ReturnCode p9_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0)
+fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0)
 {
     {
         fapi2::buffer<uint64_t> l_scom_buffer;
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.H
index 8169ddff2..583568fbc 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.H $ */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,8 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#ifndef _INIT_P9_MCBIST_SCOM_PROCEDURE_H_
-#define _INIT_P9_MCBIST_SCOM_PROCEDURE_H_
+#ifndef _INIT_P9N_MCBIST_SCOM_PROCEDURE_H_
+#define _INIT_P9N_MCBIST_SCOM_PROCEDURE_H_
 
 
 #include <stddef.h>
@@ -31,12 +31,12 @@
 #include <fapi2.H>
 
 
-typedef fapi2::ReturnCode (*p9_mcbist_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&);
+typedef fapi2::ReturnCode (*p9n_mcbist_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0);
+    fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT0);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.mk b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.mk
index 7f90be816..04ee2d1e5 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcbist_scom.mk $
+# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2017
 # [+] International Business Machines Corp.
 #
 #
@@ -22,6 +22,6 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-PROCEDURE=p9_mcbist_scom
+PROCEDURE=p9n_mcbist_scom
 lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
 $(call BUILD_PROCEDURE)
\ No newline at end of file
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.C
index 3d159b871..0f71c3f2a 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.C $  */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.C $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#include "p9_mcs_scom.H"
+#include "p9n_mcs_scom.H"
 #include <stdint.h>
 #include <stddef.h>
 #include <fapi2.H>
@@ -40,9 +40,9 @@ constexpr uint64_t literal_1350 = 1350;
 constexpr uint64_t literal_1000 = 1000;
 constexpr uint64_t literal_0b0000000000001000 = 0b0000000000001000;
 
-fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
-                              const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2,
-                              const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT3)
+fapi2::ReturnCode p9n_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
+                               const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2,
+                               const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT3)
 {
     {
         fapi2::ATTR_EC_Type   l_chip_ec;
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.H
index 00f2df3b7..03ac84a88 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mcs_scom.H $  */
+/* $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.H $ */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2017                             */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,8 +22,8 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-#ifndef _INIT_P9_MCS_SCOM_PROCEDURE_H_
-#define _INIT_P9_MCS_SCOM_PROCEDURE_H_
+#ifndef _INIT_P9N_MCS_SCOM_PROCEDURE_H_
+#define _INIT_P9N_MCS_SCOM_PROCEDURE_H_
 
 
 #include <stddef.h>
@@ -31,16 +31,16 @@
 #include <fapi2.H>
 
 
-typedef fapi2::ReturnCode (*p9_mcs_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
+typedef fapi2::ReturnCode (*p9n_mcs_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_MCS>&,
         const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
         const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>&);
 
 extern "C"
 {
 
-    fapi2::ReturnCode p9_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
-                                  const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2,
-                                  const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT3);
+    fapi2::ReturnCode p9n_mcs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT0,
+                                   const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2,
+                                   const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT3);
 
 }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.mk b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.mk
index 60c7e533c..95228b688 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9_mca_scom.mk $
+# $Source: src/import/chips/p9/procedures/hwp/initfiles/p9n_mcs_scom.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2017
 # [+] International Business Machines Corp.
 #
 #
@@ -22,6 +22,6 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
-PROCEDURE=p9_mca_scom
+PROCEDURE=p9n_mcs_scom
 lib$(PROCEDURE)_COMMONFLAGS+=-fno-var-tracking-assignments
 $(call BUILD_PROCEDURE)
\ No newline at end of file
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C
index 3a4c8bc53..fe1e34dbd 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_scominit.C
@@ -35,9 +35,9 @@
 
 #include <fapi2.H>
 #include <p9_mss_scominit.H>
-#include <p9_mca_scom.H>
-#include <p9_mcbist_scom.H>
-#include <p9_ddrphy_scom.H>
+#include <p9n_mca_scom.H>
+#include <p9n_mcbist_scom.H>
+#include <p9n_ddrphy_scom.H>
 #include <lib/utils/count_dimm.H>
 #include <generic/memory/lib/utils/find.H>
 #include <lib/phy/ddr_phy.H>
@@ -77,7 +77,7 @@ fapi2::ReturnCode p9_mss_scominit( const fapi2::Target<TARGET_TYPE_MCBIST>& i_ta
         if (mss::count_dimm(l_mca_target) != 0)
         {
             FAPI_INF("mca scominit for %s", mss::c_str(l_mca_target));
-            FAPI_EXEC_HWP(l_rc, p9_mca_scom, l_mca_target, i_target, l_mca_target.getParent<fapi2::TARGET_TYPE_MCS>(),
+            FAPI_EXEC_HWP(l_rc, p9n_mca_scom, l_mca_target, i_target, l_mca_target.getParent<fapi2::TARGET_TYPE_MCS>(),
                           FAPI_SYSTEM, i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>());
 
             if (l_rc)
@@ -94,7 +94,7 @@ fapi2::ReturnCode p9_mss_scominit( const fapi2::Target<TARGET_TYPE_MCBIST>& i_ta
         // ... but we do scominit PHY's with no DIMM. There are no attributes needed and we need
         // to make sure we init the magic port.
         FAPI_INF("phy scominit for %s", mss::c_str(l_mca_target));
-        FAPI_EXEC_HWP(l_rc, p9_ddrphy_scom, l_mca_target, i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>());
+        FAPI_EXEC_HWP(l_rc, p9n_ddrphy_scom, l_mca_target, i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>());
 
         if (l_rc)
         {
@@ -104,7 +104,7 @@ fapi2::ReturnCode p9_mss_scominit( const fapi2::Target<TARGET_TYPE_MCBIST>& i_ta
         }
     }
 
-    FAPI_EXEC_HWP(l_rc, p9_mcbist_scom, i_target );
+    FAPI_EXEC_HWP(l_rc, p9n_mcbist_scom, i_target );
 
     if (l_rc)
     {
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C
index a4d33dbdb..651398548 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C
@@ -42,7 +42,7 @@
 #include <p9_chiplet_scominit.H>
 #include <p9_fbc_ioo_tl_scom.H>
 #include <p9_fbc_ioo_dl_scom.H>
-#include <p9_mcs_scom.H>
+#include <p9n_mcs_scom.H>
 #include <p9_cxa_scom.H>
 #include <p9_nx_scom.H>
 #include <p9_int_scom.H>
@@ -187,7 +187,7 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO
     {
         fapi2::toString(l_mcs_target, l_chipletTargetStr, sizeof(l_chipletTargetStr));
         FAPI_DBG("Invoking p9.mcs.scom.initfile on target %s...", l_chipletTargetStr);
-        FAPI_EXEC_HWP(l_rc, p9_mcs_scom, l_mcs_target, FAPI_SYSTEM, i_target,
+        FAPI_EXEC_HWP(l_rc, p9n_mcs_scom, l_mcs_target, FAPI_SYSTEM, i_target,
                       l_mcs_target.getParent<fapi2::TARGET_TYPE_MCBIST>());
 
         if (l_rc)
diff --git a/src/usr/isteps/istep10/makefile b/src/usr/isteps/istep10/makefile
index f0101903d..cf19d8929 100644
--- a/src/usr/isteps/istep10/makefile
+++ b/src/usr/isteps/istep10/makefile
@@ -99,8 +99,8 @@ include ${PROCEDURES_PATH}/hwp/perv/p9_nv_ref_clk_enable.mk
 # proc_pcie_scominit : Apply scom inits to PCIe chiplets
 include ${PROCEDURES_PATH}/hwp/nest/p9_pcie_scominit.mk
 
-# p9_mcs_scom
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_mcs_scom.mk
+# p9n_mcs_scom
+include ${PROCEDURES_PATH}/hwp/initfiles/p9n_mcs_scom.mk
 
 # proc_scomoverride_chiplets : Apply sequenced scom inits
 include ${PROCEDURES_PATH}/hwp/nest/p9_scomoverride_chiplets.mk
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 4a1d24952..c4d1861e9 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -77,9 +77,9 @@ include ${PROCEDURES_PATH}/hwp/perv/p9_mem_startclocks.mk
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_scominit.mk
 include ${PROCEDURES_PATH}/hwp/nest/p9_throttle_sync.mk
 
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_ddrphy_scom.mk
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_mca_scom.mk
-include ${PROCEDURES_PATH}/hwp/initfiles/p9_mcbist_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9n_ddrphy_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9n_mca_scom.mk
+include ${PROCEDURES_PATH}/hwp/initfiles/p9n_mcbist_scom.mk
 
 #Dram init
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit.mk