408 files changed, 3 insertions, 3 deletions

diff --git a/env.bash b/env.bash
index baf3a2ca..eedda835 100755
--- a/env.bash
+++ b/env.bash
@@ -29,7 +29,7 @@ if [ -e ./customrc ]; then
     source ./customrc
 fi
 
-export PATH=${PATH}:${SBEROOT}/import/chips/p9/xip/bin/
+export PATH=${PATH}:${SBEROOT}/src/import/chips/p9/xip/bin/
 export PATH=${PATH}:${SBEROOT}/src/tools/trace/
 
 if [ -n "${SANDBOXROOT}" ]; then
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index b14ca419..4420c9b5 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -96,7 +96,7 @@ export BOOT_SRCDIR = $(SBE_SRC_DIR)/boot
 endif
 
 ifndef IMPORT_SRCDIR
-export IMPORT_SRCDIR = $(SBE_ROOT_DIR)/import
+export IMPORT_SRCDIR = $(SBE_SRC_DIR)/import
 endif
 
 ifndef TOOLS_SRCDIR
diff --git a/import/.empty b/src/import/.empty
index e69de29b..e69de29b 100644
--- a/import/.empty
+++ b/src/import/.empty
diff --git a/import/chips/p9/common/include/p9_const_common.H b/src/import/chips/p9/common/include/p9_const_common.H
index e71d288b..e71d288b 100644
--- a/import/chips/p9/common/include/p9_const_common.H
+++ b/src/import/chips/p9/common/include/p9_const_common.H
diff --git a/import/chips/p9/common/include/p9_mc_scom_addresses.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses.H
index e9c23ad4..e9c23ad4 100644
--- a/import/chips/p9/common/include/p9_mc_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H
index e1a0b264..e1a0b264 100644
--- a/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H
index 23a86b17..23a86b17 100644
--- a/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H
index 0c27c47f..0c27c47f 100644
--- a/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_mc_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/common/include/p9_misc_scom_addresses.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses.H
index c387ea06..c387ea06 100644
--- a/import/chips/p9/common/include/p9_misc_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H
index 3cf40bed..3cf40bed 100644
--- a/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H
index cf048f33..cf048f33 100644
--- a/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H
index b62d9d92..b62d9d92 100644
--- a/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_misc_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/common/include/p9_obus_scom_addresses.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses.H
index 48ac3c2c..48ac3c2c 100644
--- a/import/chips/p9/common/include/p9_obus_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H
index dd9766f0..dd9766f0 100644
--- a/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H
index 722b1970..722b1970 100644
--- a/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H
index 41b4ad89..41b4ad89 100644
--- a/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_obus_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/common/include/p9_perv_scom_addresses.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses.H
index d418ad7c..d418ad7c 100644
--- a/import/chips/p9/common/include/p9_perv_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H
index f835e4d8..f835e4d8 100644
--- a/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H
index 78b6cf8d..78b6cf8d 100644
--- a/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H
index 5baf3510..5baf3510 100644
--- a/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_perv_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses.H
index 878f0e6b..878f0e6b 100644
--- a/import/chips/p9/common/include/p9_quad_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H
index 5e132947..5e132947 100644
--- a/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H
index 80fc95e8..80fc95e8 100644
--- a/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H
index d6383558..d6383558 100644
--- a/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_quad_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/common/include/p9_scom_template_consts.H b/src/import/chips/p9/common/include/p9_scom_template_consts.H
index e4e8e654..e4e8e654 100644
--- a/import/chips/p9/common/include/p9_scom_template_consts.H
+++ b/src/import/chips/p9/common/include/p9_scom_template_consts.H
diff --git a/import/chips/p9/common/include/p9_xbus_scom_addresses.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H
index 14edd5be..14edd5be 100644
--- a/import/chips/p9/common/include/p9_xbus_scom_addresses.H
+++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses.H
diff --git a/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H
index 8c7cc415..8c7cc415 100644
--- a/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H
+++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fixes.H
diff --git a/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H
index df6fab4f..df6fab4f 100644
--- a/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H
+++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld.H
diff --git a/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H
index 8d352fb9..8d352fb9 100644
--- a/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H
+++ b/src/import/chips/p9/common/include/p9_xbus_scom_addresses_fld_fixes.H
diff --git a/import/chips/p9/procedures/hwp/cache/Makefile b/src/import/chips/p9/procedures/hwp/cache/Makefile
index a95923ab..a95923ab 100644
--- a/import/chips/p9/procedures/hwp/cache/Makefile
+++ b/src/import/chips/p9/procedures/hwp/cache/Makefile
diff --git a/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk b/src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk
index f8ae915e..f8ae915e 100644
--- a/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/cache/cachehcdfiles.mk
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache.H
index d73007e7..d73007e7 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.C
index 3b2887c4..3b2887c4 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.H
index 16b97e5b..16b97e5b 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_arrayinit.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.C
index 2978337b..2978337b 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.H
index 7b55f9ee..7b55f9ee 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_init.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.C
index 0cf09244..0cf09244 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.H
index 2033f38f..2033f38f 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_l3_dcc_setup.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.C
index 8f35b4ed..8f35b4ed 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.H
index 1582c76d..1582c76d 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_chiplet_reset.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C
index 64b30d93..64b30d93 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.H
index 3c48f52a..3c48f52a 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_initf.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.C
index 744f0ae9..744f0ae9 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.H
index 0da2ea3b..0da2ea3b 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_dpll_setup.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C
index 4a2e620f..4a2e620f 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.H
index 714395cf..714395cf 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_gptr_time_initf.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
index 3eb56747..3eb56747 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.H
index 1754c690..1754c690 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.C
index d0e592a4..d0e592a4 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.H
index 24c329f8..24c329f8 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_occ_runtime_scom.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.C
index c5193803..c5193803 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.H
index 656616f4..656616f4 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_poweron.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.C
index 5398597e..5398597e 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.H
index 394fb6f6..394fb6f6 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_ras_runtime_scom.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C
index b34ae956..b34ae956 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.H
index 3712cafb..3712cafb 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_repair_initf.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.C
index 96ce825d..96ce825d 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.H
index cc3e8884..cc3e8884 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scomcust.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C
index 38ee4977..38ee4977 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.H
index ded02249..ded02249 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_scominit.H
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.C b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.C
index a7bc1510..a7bc1510 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.C
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.C
diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.H b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.H
index d0ad61d6..d0ad61d6 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.H
+++ b/src/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_startclocks.H
diff --git a/import/chips/p9/procedures/hwp/core/Makefile b/src/import/chips/p9/procedures/hwp/core/Makefile
index 15ace37d..15ace37d 100644
--- a/import/chips/p9/procedures/hwp/core/Makefile
+++ b/src/import/chips/p9/procedures/hwp/core/Makefile
diff --git a/import/chips/p9/procedures/hwp/core/corehcdfiles.mk b/src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk
index b7c2abcc..b7c2abcc 100644
--- a/import/chips/p9/procedures/hwp/core/corehcdfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/core/corehcdfiles.mk
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core.H
index 1c766fb3..1c766fb3 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.C
index 0706e244..0706e244 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.H
index dde880ee..dde880ee 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_arrayinit.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.C
index 9007a7f8..9007a7f8 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.H
index c86b128c..c86b128c 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_init.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.C
index c3bd9567..c3bd9567 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.H
index 9db24521..9db24521 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_chiplet_reset.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C
index fa147a3d..fa147a3d 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.H
index 22c88c3f..22c88c3f 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_gptr_time_initf.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.C
index 86e72aac..86e72aac 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.H
index accbf0ea..accbf0ea 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_initf.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.C
index 9211d7fc..9211d7fc 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.H
index 7dad1c6e..7dad1c6e 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_occ_runtime_scom.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.C
index 729f98b7..729f98b7 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.H
index f3bfad93..f3bfad93 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_pcb_arb.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.C
index 5e66f673..5e66f673 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.H
index 91b73cf9..91b73cf9 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_poweron.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.C
index 6ad7100f..6ad7100f 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.H
index 511b35c4..511b35c4 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_ras_runtime_scom.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C
index b8f6be7e..b8f6be7e 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.H
index a998c4bd..a998c4bd 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_repair_initf.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C
index 54ed6dd5..54ed6dd5 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H
index f69ce528..f69ce528 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scomcust.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
index c05caed4..c05caed4 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.H
index 7065028e..7065028e 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_scominit.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C
index 3cccb8b5..3cccb8b5 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.H b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.H
index 75e94909..75e94909 100644
--- a/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_hcd_core_startclocks.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.C b/src/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.C
index fb6affa0..fb6affa0 100644
--- a/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.H b/src/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.H
index d143fd43..d143fd43 100644
--- a/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_sbe_instruct_start.H
diff --git a/import/chips/p9/procedures/hwp/core/p9_thread_control.C b/src/import/chips/p9/procedures/hwp/core/p9_thread_control.C
index 529fd829..529fd829 100644
--- a/import/chips/p9/procedures/hwp/core/p9_thread_control.C
+++ b/src/import/chips/p9/procedures/hwp/core/p9_thread_control.C
diff --git a/import/chips/p9/procedures/hwp/core/p9_thread_control.H b/src/import/chips/p9/procedures/hwp/core/p9_thread_control.H
index 14821a5c..14821a5c 100755
--- a/import/chips/p9/procedures/hwp/core/p9_thread_control.H
+++ b/src/import/chips/p9/procedures/hwp/core/p9_thread_control.H
diff --git a/import/chips/p9/procedures/hwp/initfiles/Makefile b/src/import/chips/p9/procedures/hwp/initfiles/Makefile
index 123518a1..123518a1 100644
--- a/import/chips/p9/procedures/hwp/initfiles/Makefile
+++ b/src/import/chips/p9/procedures/hwp/initfiles/Makefile
diff --git a/import/chips/p9/procedures/hwp/initfiles/initfiles.mk b/src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk
index 9703f3e3..9703f3e3 100644
--- a/import/chips/p9/procedures/hwp/initfiles/initfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/initfiles/initfiles.mk
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
index e85d8585..e85d8585 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.H
index 69653c03..69653c03 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.H
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
index 1186e9d2..1186e9d2 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.H
index 8f8edb08..8f8edb08 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.H
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
index 950a088d..950a088d 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H
index bc56a154..bc56a154 100644
--- a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.H
diff --git a/import/chips/p9/procedures/hwp/lib/Makefile b/src/import/chips/p9/procedures/hwp/lib/Makefile
index 059fb2f3..059fb2f3 100644
--- a/import/chips/p9/procedures/hwp/lib/Makefile
+++ b/src/import/chips/p9/procedures/hwp/lib/Makefile
diff --git a/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk b/src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk
index cbcd12ee..cbcd12ee 100644
--- a/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/lib/libcommonfiles.mk
diff --git a/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.C b/src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.C
index 52916b7f..52916b7f 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.C
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.C
diff --git a/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.H b/src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.H
index 9bb01bce..9bb01bce 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_common_poweronoff.H
diff --git a/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.C b/src/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.C
index 05cd69e7..05cd69e7 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.C
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.C
diff --git a/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.H b/src/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.H
index f119bfaf..f119bfaf 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_common_pro_epi_log.H
diff --git a/import/chips/p9/procedures/hwp/lib/p9_hcd_common.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_common.H
index d09b7014..d09b7014 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_hcd_common.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_common.H
diff --git a/import/chips/p9/procedures/hwp/lib/p9_pm_stop_history.H b/src/import/chips/p9/procedures/hwp/lib/p9_pm_stop_history.H
index 38e94226..38e94226 100644
--- a/import/chips/p9/procedures/hwp/lib/p9_pm_stop_history.H
+++ b/src/import/chips/p9/procedures/hwp/lib/p9_pm_stop_history.H
diff --git a/import/chips/p9/procedures/hwp/nest/Makefile b/src/import/chips/p9/procedures/hwp/nest/Makefile
index 8c4adc0b..8c4adc0b 100644
--- a/import/chips/p9/procedures/hwp/nest/Makefile
+++ b/src/import/chips/p9/procedures/hwp/nest/Makefile
diff --git a/import/chips/p9/procedures/hwp/nest/nestfiles.mk b/src/import/chips/p9/procedures/hwp/nest/nestfiles.mk
index b3ddbdff..b3ddbdff 100644
--- a/import/chips/p9/procedures/hwp/nest/nestfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/nest/nestfiles.mk
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_access.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
index 360c5837..360c5837 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_access.H b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.H
index 0b8e1a15..0b8e1a15 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_access.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_access.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.C
index 7782cae2..7782cae2 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.H b/src/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.H
index 667e3f6b..667e3f6b 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_coherent_utils.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_constants.H b/src/import/chips/p9/procedures/hwp/nest/p9_adu_constants.H
index d0449e0d..d0449e0d 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_constants.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_constants.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
index e270772a..e270772a 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_adu_setup.H b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.H
index ffdd38b0..ffdd38b0 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_adu_setup.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_adu_setup.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C
index 4c9e3a12..4c9e3a12 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.H b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.H
index af73102e..af73102e 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_fbc_utils.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_access.C b/src/import/chips/p9/procedures/hwp/nest/p9_pba_access.C
index 5a3970b3..5a3970b3 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_access.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_access.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_access.H b/src/import/chips/p9/procedures/hwp/nest/p9_pba_access.H
index 7e02c926..7e02c926 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_access.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_access.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.C b/src/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.C
index c4f32d8c..c4f32d8c 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.H b/src/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.H
index e4be1c65..e4be1c65 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_coherent_utils.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_constants.H b/src/import/chips/p9/procedures/hwp/nest/p9_pba_constants.H
index f7914672..f7914672 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_constants.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_constants.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_pba_setup.C
index 32df239e..32df239e 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_setup.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_setup.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_pba_setup.H b/src/import/chips/p9/procedures/hwp/nest/p9_pba_setup.H
index 96ce4025..96ce4025 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_pba_setup.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_pba_setup.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.C
index 840ad79b..840ad79b 100755
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.H
index ee1acf4a..ee1acf4a 100755
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_hb_structures.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_hb_structures.H
index 0fd5b531..0fd5b531 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_hb_structures.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_hb_structures.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C
index 10380058..10380058 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.H
index e5536789..e5536789 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_load_bootloader.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.C
index 1fe5dc4f..1fe5dc4f 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.H
index d3017dcf..d3017dcf 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_mcs_setup.H
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.C
index a2510582..a2510582 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.C
diff --git a/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.H b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.H
index 4129098e..4129098e 100644
--- a/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_sbe_scominit.H
diff --git a/import/chips/p9/procedures/hwp/perv/Makefile b/src/import/chips/p9/procedures/hwp/perv/Makefile
index ac2ee6de..ac2ee6de 100644
--- a/import/chips/p9/procedures/hwp/perv/Makefile
+++ b/src/import/chips/p9/procedures/hwp/perv/Makefile
diff --git a/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.C
index e850723f..e850723f 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.H b/src/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.H
index c6a0c6f2..c6a0c6f2 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_hcd_cache_dcc_skewadjust_setup.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C b/src/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
index 364d4013..364d4013 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.H b/src/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.H
index b2472eb3..b2472eb3 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_perv_sbe_cmn.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_ram_core.C b/src/import/chips/p9/procedures/hwp/perv/p9_ram_core.C
index d11fe6bf..d11fe6bf 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_ram_core.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_ram_core.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_ram_core.H b/src/import/chips/p9/procedures/hwp/perv/p9_ram_core.H
index 46f0eaf7..46f0eaf7 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_ram_core.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_ram_core.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
index 79046f0e..79046f0e 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.H
index 9fc72c1b..9fc72c1b 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_arrayinit.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
index ee741b8c..ee741b8c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.H
index 0a5e2a09..0a5e2a09 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.C
index 1cd61c93..1cd61c93 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.H
index 88c3bf21..88c3bf21 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.C
index 4d28bdbd..4d28bdbd 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.H
index 575536d9..575536d9 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_check_master_stop15.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
index 521078bd..521078bd 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.H
index 72d20577..72d20577 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_init.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
index a36fa629..a36fa629 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.H
index a45218b9..a45218b9 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
index a152c465..a152c465 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.H
index c2b1caad..c2b1caad 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_pll_setup.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
index 951b4696..951b4696 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.H
index feeec54b..feeec54b 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_chiplet_reset.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.C
index 3a8a765c..3a8a765c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.H
index 180d8c66..180d8c66 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_clock_test2.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
index c9586829..c9586829 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_common.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_common.H
index f3876594..f3876594 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_common.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_common.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.C
index d9a3f2d5..d9a3f2d5 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.H
index 00a5ebc6..00a5ebc6 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_enable_seeprom.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
index 25d61ad0..25d61ad0 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
index 845b68e9..845b68e9 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
index ce8302a9..ce8302a9 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.H
index 5a048f1d..5a048f1d 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C
index ff4bde17..ff4bde17 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H
index da24195e..da24195e 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_repr_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
index 00e00d24..00e00d24 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.H
index c1f186bd..c1f186bd 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_io_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
index 25336c49..25336c49 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.H
index eabe73f1..eabe73f1 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_lpc_init.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
index 63bbe75e..63bbe75e 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.H
index 6c7b2dfb..6c7b2dfb 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_enable_ridi.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
index 434e0137..434e0137 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.H
index 90a8321e..90a8321e 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
index d0737f78..d0737f78 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.H
index efc40a97..efc40a97 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_startclocks.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
index 79e0c0e3..79e0c0e3 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.H
index 025d2377..025d2377 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
index 331fa528..331fa528 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.H
index b05c7db1..b05c7db1 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_npll_setup.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
index 9dc91da6..9dc91da6 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.H
index b5dbbe99..b5dbbe99 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C
index af7c2299..af7c2299 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.H
index 3c40e9aa..3c40e9aa 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_select_ex.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.C
index 420680f7..420680f7 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.H
index c41909ae..c41909ae 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_boot_freq.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.C
index e7797e75..e7797e75 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.H
index a1ab2263..a1ab2263 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_setup_evid.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
index f55ae68d..f55ae68d 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.H
index a9e777f6..a9e777f6 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_startclock_chiplets.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
index 151aa89d..151aa89d 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.H
index 9ab5e359..9ab5e359 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_arrayinit.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
index c953c3cf..c953c3cf 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.H
index 39383792..39383792 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init1.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
index 69c6f6c3..69c6f6c3 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.H
index 34d94425..34d94425 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init2.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
index c7af39d3..c7af39d3 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.H
index c5367d97..c5367d97 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_init3.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
index f7960207..f7960207 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.H
index 441a7a6e..441a7a6e 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_chiplet_reset.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
index b8c22322..b8c22322 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.H
index c18e9a7f..c18e9a7f 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_enable_ridi.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
index 42957145..42957145 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.H
index 2b99ade3..2b99ade3 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C
index 2c351d74..2c351d74 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H
index 27ba211c..27ba211c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_gptr_time_repr_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
index f1150966..f1150966 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.H
index abf1f54c..abf1f54c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.C
index 7c933122..7c933122 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.H
index e458d2be..e458d2be 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_ld_image.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
index 53aed3bb..53aed3bb 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.H
index 134fc853..134fc853 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_repr_initf.H
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
index 828c855c..828c855c 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
diff --git a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
index a53d025f..a53d025f 100644
--- a/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
diff --git a/import/chips/p9/procedures/hwp/perv/pervfiles.mk b/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk
index d4b77bb7..d4b77bb7 100644
--- a/import/chips/p9/procedures/hwp/perv/pervfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/perv/pervfiles.mk
diff --git a/import/chips/p9/procedures/hwp/pm/Makefile b/src/import/chips/p9/procedures/hwp/pm/Makefile
index 65f3170a..65f3170a 100644
--- a/import/chips/p9/procedures/hwp/pm/Makefile
+++ b/src/import/chips/p9/procedures/hwp/pm/Makefile
diff --git a/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.C b/src/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.C
index fce9dea9..fce9dea9 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.H b/src/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.H
index f4aaaf44..f4aaaf44 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_block_wakeup_intr.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm.H
index d14c021a..d14c021a 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.C
index c88407cd..c88407cd 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.H
index e5b548fb..e5b548fb 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_access.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C
index ef7f0138..ef7f0138 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H
index a366bbd8..a366bbd8 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C
index 292659cb..292659cb 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H
index 27adcc48..27adcc48 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C
index 2ac813d6..2ac813d6 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H
index 1130fcaa..1130fcaa 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_utils.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_utils.C
index 4809d65e..4809d65e 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_utils.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_utils.C
diff --git a/import/chips/p9/procedures/hwp/pm/p9_pm_utils.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_utils.H
index 3524991e..3524991e 100644
--- a/import/chips/p9/procedures/hwp/pm/p9_pm_utils.H
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_utils.H
diff --git a/import/chips/p9/procedures/hwp/pm/pmfiles.mk b/src/import/chips/p9/procedures/hwp/pm/pmfiles.mk
index e34a62c4..e34a62c4 100644
--- a/import/chips/p9/procedures/hwp/pm/pmfiles.mk
+++ b/src/import/chips/p9/procedures/hwp/pm/pmfiles.mk
diff --git a/import/chips/p9/procedures/ppe/include/std/algorithm b/src/import/chips/p9/procedures/ppe/include/std/algorithm
index 6e96dd96..6e96dd96 100644
--- a/import/chips/p9/procedures/ppe/include/std/algorithm
+++ b/src/import/chips/p9/procedures/ppe/include/std/algorithm
diff --git a/import/chips/p9/procedures/ppe/include/std/iterator b/src/import/chips/p9/procedures/ppe/include/std/iterator
index 45e0386e..45e0386e 100644
--- a/import/chips/p9/procedures/ppe/include/std/iterator
+++ b/src/import/chips/p9/procedures/ppe/include/std/iterator
diff --git a/import/chips/p9/procedures/ppe/include/std/new b/src/import/chips/p9/procedures/ppe/include/std/new
index 4d323cf7..4d323cf7 100755
--- a/import/chips/p9/procedures/ppe/include/std/new
+++ b/src/import/chips/p9/procedures/ppe/include/std/new
diff --git a/import/chips/p9/procedures/ppe/include/std/type_traits b/src/import/chips/p9/procedures/ppe/include/std/type_traits
index 1d2e3f0a..1d2e3f0a 100644
--- a/import/chips/p9/procedures/ppe/include/std/type_traits
+++ b/src/import/chips/p9/procedures/ppe/include/std/type_traits
diff --git a/import/chips/p9/procedures/ppe/include/std/util/impl/iterator.h b/src/import/chips/p9/procedures/ppe/include/std/util/impl/iterator.h
index 6b2794f5..6b2794f5 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/impl/iterator.h
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/impl/iterator.h
diff --git a/import/chips/p9/procedures/ppe/include/std/util/impl/qsort.H b/src/import/chips/p9/procedures/ppe/include/std/util/impl/qsort.H
index 1bb0e10e..1bb0e10e 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/impl/qsort.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/impl/qsort.H
diff --git a/import/chips/p9/procedures/ppe/include/std/util/traits/has_lessthan.H b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_lessthan.H
index f289ea5d..f289ea5d 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/traits/has_lessthan.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_lessthan.H
diff --git a/import/chips/p9/procedures/ppe/include/std/util/traits/has_minus.H b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_minus.H
index 5d8778c9..5d8778c9 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/traits/has_minus.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_minus.H
diff --git a/import/chips/p9/procedures/ppe/include/std/util/traits/has_plusequals.H b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_plusequals.H
index a26d34ae..a26d34ae 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/traits/has_plusequals.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/traits/has_plusequals.H
diff --git a/import/chips/p9/procedures/ppe/include/std/util/traits/impl/has_comparison.H b/src/import/chips/p9/procedures/ppe/include/std/util/traits/impl/has_comparison.H
index 07ea589a..07ea589a 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/traits/impl/has_comparison.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/traits/impl/has_comparison.H
diff --git a/import/chips/p9/procedures/ppe/include/std/util/traits/remove_const.H b/src/import/chips/p9/procedures/ppe/include/std/util/traits/remove_const.H
index b447ff83..b447ff83 100644
--- a/import/chips/p9/procedures/ppe/include/std/util/traits/remove_const.H
+++ b/src/import/chips/p9/procedures/ppe/include/std/util/traits/remove_const.H
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/Makefile b/src/import/chips/p9/procedures/ppe/pk/kernel/Makefile
index 9494348f..9494348f 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/Makefile
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/Makefile
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk.h
index 7d063b75..7d063b75 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_api.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_api.h
index b094519c..b094519c 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_api.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_api.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_bh_core.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_bh_core.c
index 734d529c..734d529c 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_bh_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_bh_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_core.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_core.c
index 2f91d94e..2f91d94e 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.c
index 76a05508..76a05508 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.h
index 02ef948d..02ef948d 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_debug_ptrs.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_init.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_init.c
index 056bf270..056bf270 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_kernel.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_kernel.h
index 2afd184f..2afd184f 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_kernel.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_kernel.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_macros.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_macros.h
index 61155679..61155679 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_macros.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_macros.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_core.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_core.c
index 5b1e3374..5b1e3374 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_init.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_init.c
index 821acd62..821acd62 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_semaphore_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_stack_init.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_stack_init.c
index 8df26c4c..8df26c4c 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_stack_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_stack_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread.h b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread.h
index 13b6a215..13b6a215 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread.h
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread.h
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_core.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_core.c
index c57ff970..c57ff970 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_init.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_init.c
index a0a8b956..a0a8b956 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_util.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_util.c
index 670a89a0..670a89a0 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_util.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_thread_util.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_core.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_core.c
index 2b812963..2b812963 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_init.c b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_init.c
index 595fb376..595fb376 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pk_timer_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/kernel/pkkernelfiles.mk b/src/import/chips/p9/procedures/ppe/pk/kernel/pkkernelfiles.mk
index 58c758e0..58c758e0 100644
--- a/import/chips/p9/procedures/ppe/pk/kernel/pkkernelfiles.mk
+++ b/src/import/chips/p9/procedures/ppe/pk/kernel/pkkernelfiles.mk
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/Makefile b/src/import/chips/p9/procedures/ppe/pk/ppe42/Makefile
index 60f8d7f8..60f8d7f8 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/Makefile
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/Makefile
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/div64.S b/src/import/chips/p9/procedures/ppe/pk/ppe42/div64.S
index cf19fa6e..cf19fa6e 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/div64.S
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/div64.S
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/eabi.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/eabi.c
index 140cc2be..140cc2be 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/eabi.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/eabi.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/endian.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/endian.h
index dade05cf..dade05cf 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/endian.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/endian.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/math.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/math.c
index 1cddc624..1cddc624 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/math.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/math.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/pk_panic_codes.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/pk_panic_codes.h
index 0e079657..0e079657 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/pk_panic_codes.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/pk_panic_codes.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/pk_port_types.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/pk_port_types.h
index 7a368d4e..7a368d4e 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/pk_port_types.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/pk_port_types.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk b/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk
index accca3f4..accca3f4 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/pkppe42files.mk
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42.h
index 6857ce10..6857ce10 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_asm.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_asm.h
index 6f3923aa..6f3923aa 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_asm.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_asm.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_boot.S b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_boot.S
index 6c3424f5..6c3424f5 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_boot.S
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_boot.S
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_cache.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_cache.h
index cb06196d..cb06196d 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_cache.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_cache.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_context.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_context.h
index e54f255d..e54f255d 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_context.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_context.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_core.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_core.c
index ec8aec6d..ec8aec6d 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_exceptions.S b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_exceptions.S
index 9c89284c..9c89284c 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_exceptions.S
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_exceptions.S
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.c
index 9b7aa8a8..9b7aa8a8 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.h
index 7b9d37e1..7b9d37e1 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_gcc.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c
index f81b5863..f81b5863 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h
index 24f30fa1..24f30fa1 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq_core.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq_core.c
index 0021457f..0021457f 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_irq_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_msr.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_msr.h
index 8660f20d..8660f20d 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_msr.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_msr.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.c
index 1dffcef4..1dffcef4 100755
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.h
index d3a8d2a7..d3a8d2a7 100755
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_scom.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_spr.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_spr.h
index f95139bd..f95139bd 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_spr.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_spr.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.c b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.c
index 4f0e954c..4f0e954c 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.c
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.c
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.h
index dfa79c26..dfa79c26 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_string.h
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_thread_init.S b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_thread_init.S
index 1bed7882..1bed7882 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_thread_init.S
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_thread_init.S
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_timebase.S b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_timebase.S
index cc40bce4..cc40bce4 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_timebase.S
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42_timebase.S
diff --git a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42math.h b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42math.h
index e4f98cdd..e4f98cdd 100644
--- a/import/chips/p9/procedures/ppe/pk/ppe42/ppe42math.h
+++ b/src/import/chips/p9/procedures/ppe/pk/ppe42/ppe42math.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/Makefile b/src/import/chips/p9/procedures/ppe/pk/std/Makefile
index 7d4613ed..7d4613ed 100644
--- a/import/chips/p9/procedures/ppe/pk/std/Makefile
+++ b/src/import/chips/p9/procedures/ppe/pk/std/Makefile
diff --git a/import/chips/p9/procedures/ppe/pk/std/pk_port.h b/src/import/chips/p9/procedures/ppe/pk/std/pk_port.h
index d214ba1f..d214ba1f 100644
--- a/import/chips/p9/procedures/ppe/pk/std/pk_port.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/pk_port.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/pkstdfiles.mk b/src/import/chips/p9/procedures/ppe/pk/std/pkstdfiles.mk
index 71b8521f..71b8521f 100644
--- a/import/chips/p9/procedures/ppe/pk/std/pkstdfiles.mk
+++ b/src/import/chips/p9/procedures/ppe/pk/std/pkstdfiles.mk
diff --git a/import/chips/p9/procedures/ppe/pk/std/std.h b/src/import/chips/p9/procedures/ppe/pk/std/std.h
index 61b554bd..61b554bd 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_common.h b/src/import/chips/p9/procedures/ppe/pk/std/std_common.h
index a1f52eda..a1f52eda 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_common.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_common.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_init.c b/src/import/chips/p9/procedures/ppe/pk/std/std_init.c
index d2ea8c0b..d2ea8c0b 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_irq.h b/src/import/chips/p9/procedures/ppe/pk/std/std_irq.h
index 4af55745..4af55745 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_irq.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_irq.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_irq_config.h b/src/import/chips/p9/procedures/ppe/pk/std/std_irq_config.h
index 66b8b018..66b8b018 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_irq_config.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_irq_config.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_irq_init.c b/src/import/chips/p9/procedures/ppe/pk/std/std_irq_init.c
index 1115c4bb..1115c4bb 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_irq_init.c
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_irq_init.c
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_register_addresses.h b/src/import/chips/p9/procedures/ppe/pk/std/std_register_addresses.h
index 1a6b56fc..1a6b56fc 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_register_addresses.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_register_addresses.h
diff --git a/import/chips/p9/procedures/ppe/pk/std/std_timebase.h b/src/import/chips/p9/procedures/ppe/pk/std/std_timebase.h
index f3f07448..f3f07448 100644
--- a/import/chips/p9/procedures/ppe/pk/std/std_timebase.h
+++ b/src/import/chips/p9/procedures/ppe/pk/std/std_timebase.h
diff --git a/import/chips/p9/procedures/ppe/pk/trace/Makefile b/src/import/chips/p9/procedures/ppe/pk/trace/Makefile
index 846076a9..846076a9 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/Makefile
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/Makefile
diff --git a/import/chips/p9/procedures/ppe/pk/trace/pk_trace.h b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace.h
index 21d8ceb4..21d8ceb4 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/pk_trace.h
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace.h
diff --git a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_big.c b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_big.c
index a76ae7e7..a76ae7e7 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_big.c
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_big.c
diff --git a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_binary.c b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_binary.c
index c6680a32..c6680a32 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_binary.c
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_binary.c
diff --git a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_core.c b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_core.c
index 5cd5051f..5cd5051f 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/pk_trace_core.c
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/pk_trace_core.c
diff --git a/import/chips/p9/procedures/ppe/pk/trace/pktracefiles.mk b/src/import/chips/p9/procedures/ppe/pk/trace/pktracefiles.mk
index 4e8ffa57..4e8ffa57 100644
--- a/import/chips/p9/procedures/ppe/pk/trace/pktracefiles.mk
+++ b/src/import/chips/p9/procedures/ppe/pk/trace/pktracefiles.mk
diff --git a/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
index 724a5c97..724a5c97 100644
--- a/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/core_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/core_attributes.xml
index 11c98683..11c98683 100644
--- a/import/chips/p9/procedures/xml/attribute_info/core_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/core_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
index c3bd81b8..c3bd81b8 100644
--- a/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/nest_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/p9_cache_contained_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9_cache_contained_attributes.xml
index 9caa1a92..9caa1a92 100644
--- a/import/chips/p9/procedures/xml/attribute_info/p9_cache_contained_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9_cache_contained_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
index 4972e342..4972e342 100644
--- a/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/p9_sbe_load_bootloader_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_load_bootloader_attributes.xml
index 7330b468..7330b468 100644
--- a/import/chips/p9/procedures/xml/attribute_info/p9_sbe_load_bootloader_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9_sbe_load_bootloader_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml
index 22a063c5..22a063c5 100644
--- a/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml
diff --git a/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
index 164c5ce9..164c5ce9 100644
--- a/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/pm_plat_attributes.xml
diff --git a/import/chips/p9/procedures/xml/error_info/hwpErrors.mk b/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk
index 790cdd44..790cdd44 100644
--- a/import/chips/p9/procedures/xml/error_info/hwpErrors.mk
+++ b/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk
diff --git a/import/chips/p9/procedures/xml/error_info/p9_adu_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_adu_errors.xml
index 7915500c..7915500c 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_adu_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_adu_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_block_wakeup_intr_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_block_wakeup_intr_errors.xml
index e3c1b5e1..e3c1b5e1 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_block_wakeup_intr_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_block_wakeup_intr_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_common_poweronoff_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_common_poweronoff_errors.xml
index b87937af..b87937af 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_common_poweronoff_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_common_poweronoff_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_dpll_setup_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_dpll_setup_errors.xml
index aeaa5873..aeaa5873 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_dpll_setup_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_dpll_setup_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_startclocks_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_startclocks_errors.xml
index ff244a07..ff244a07 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_startclocks_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_cache_startclocks_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_hcd_core_startclocks_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_startclocks_errors.xml
index fe5c5833..fe5c5833 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_hcd_core_startclocks_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_hcd_core_startclocks_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_pba_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pba_errors.xml
index d82615d6..d82615d6 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_pba_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pba_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_perv_sbe_cmn_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_perv_sbe_cmn_errors.xml
index dd8464d3..dd8464d3 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_perv_sbe_cmn_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_perv_sbe_cmn_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_indir_access_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_indir_access_errors.xml
index c7007a72..c7007a72 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_indir_access_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_indir_access_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_init_errors.xml
index 36ed53f6..36ed53f6 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_init_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_ocb_init_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_ram_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_ram_errors.xml
index 4d92902c..4d92902c 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_ram_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_ram_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_arrayinit_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_arrayinit_errors.xml
index 0e8763ca..0e8763ca 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_arrayinit_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_arrayinit_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_check_master_stop15_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_check_master_stop15_errors.xml
index 228ddea7..228ddea7 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_check_master_stop15_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_check_master_stop15_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_init_errors.xml
index 4d7ca4ec..4d7ca4ec 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_init_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_init_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_initf_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_initf_errors.xml
index 6521c6e5..6521c6e5 100755
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_initf_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_initf_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_setup_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_setup_errors.xml
index de377e1c..de377e1c 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_setup_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_chiplet_pll_setup_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_common_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_common_errors.xml
index 6ccb7fff..6ccb7fff 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_common_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_common_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_fabricinit_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_fabricinit_errors.xml
index a4cf028d..a4cf028d 100755
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_fabricinit_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_fabricinit_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
index a1260b90..a1260b90 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_load_bootloader_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_load_bootloader_errors.xml
index e3e46eeb..e3e46eeb 100755
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_load_bootloader_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_load_bootloader_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_mcs_setup_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_mcs_setup_errors.xml
index 3e011755..3e011755 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_mcs_setup_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_mcs_setup_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_nest_startclocks_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_nest_startclocks_errors.xml
index 7b5d51d1..7b5d51d1 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_nest_startclocks_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_nest_startclocks_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_initf_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_initf_errors.xml
index ee2b5059..ee2b5059 100755
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_initf_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_initf_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_setup_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_setup_errors.xml
index a45c8f56..a45c8f56 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_setup_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_npll_setup_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_scominit_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_scominit_errors.xml
index 97226c2d..97226c2d 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_scominit_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_scominit_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_select_ex_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_select_ex_errors.xml
index 8bff680f..8bff680f 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_select_ex_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_select_ex_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_startclock_chiplets_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_startclock_chiplets_errors.xml
index 6a5e2cb5..6a5e2cb5 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_startclock_chiplets_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_startclock_chiplets_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_arrayinit_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_arrayinit_errors.xml
index a8e23e1d..a8e23e1d 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_arrayinit_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_arrayinit_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_chiplet_init3_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_chiplet_init3_errors.xml
index 9249bda2..9249bda2 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_chiplet_init3_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_chiplet_init3_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
index f1f33966..f1f33966 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
diff --git a/import/chips/p9/procedures/xml/error_info/p9_thread_control_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_thread_control_errors.xml
index 715538a4..715538a4 100644
--- a/import/chips/p9/procedures/xml/error_info/p9_thread_control_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_thread_control_errors.xml
diff --git a/import/chips/p9/sw_simulation/chip.act b/src/import/chips/p9/sw_simulation/chip.act
index 1abe32a4..1abe32a4 100644
--- a/import/chips/p9/sw_simulation/chip.act
+++ b/src/import/chips/p9/sw_simulation/chip.act
diff --git a/import/chips/p9/sw_simulation/pervasive.act b/src/import/chips/p9/sw_simulation/pervasive.act
index 4c1d3130..4c1d3130 100644
--- a/import/chips/p9/sw_simulation/pervasive.act
+++ b/src/import/chips/p9/sw_simulation/pervasive.act
diff --git a/import/chips/p9/sw_simulation/powermgmt.act b/src/import/chips/p9/sw_simulation/powermgmt.act
index 0cfd5c41..0cfd5c41 100644
--- a/import/chips/p9/sw_simulation/powermgmt.act
+++ b/src/import/chips/p9/sw_simulation/powermgmt.act
diff --git a/import/chips/p9/utils/Makefile b/src/import/chips/p9/utils/Makefile
index 07432cd1..07432cd1 100644
--- a/import/chips/p9/utils/Makefile
+++ b/src/import/chips/p9/utils/Makefile
diff --git a/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
index f39b29d4..f39b29d4 100644
--- a/import/chips/p9/utils/imageProcs/p9_ringId.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
diff --git a/import/chips/p9/utils/imageProcs/p9_ring_id.h b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
index 55f9ad75..55f9ad75 100644
--- a/import/chips/p9/utils/imageProcs/p9_ring_id.h
+++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
diff --git a/import/chips/p9/utils/imageProcs/p9_scan_compression.H b/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H
index d20c2f04..d20c2f04 100644
--- a/import/chips/p9/utils/imageProcs/p9_scan_compression.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_scan_compression.H
diff --git a/import/chips/p9/utils/p9_putRingUtils.C b/src/import/chips/p9/utils/p9_putRingUtils.C
index 2fe6ed0e..2fe6ed0e 100644
--- a/import/chips/p9/utils/p9_putRingUtils.C
+++ b/src/import/chips/p9/utils/p9_putRingUtils.C
diff --git a/import/chips/p9/utils/p9_putRingUtils.H b/src/import/chips/p9/utils/p9_putRingUtils.H
index 2eee9c00..2eee9c00 100644
--- a/import/chips/p9/utils/p9_putRingUtils.H
+++ b/src/import/chips/p9/utils/p9_putRingUtils.H
diff --git a/import/chips/p9/utils/p9_putRingUtils.mk b/src/import/chips/p9/utils/p9_putRingUtils.mk
index d0490344..d0490344 100644
--- a/import/chips/p9/utils/p9_putRingUtils.mk
+++ b/src/import/chips/p9/utils/p9_putRingUtils.mk
diff --git a/import/chips/p9/utils/utils.mk b/src/import/chips/p9/utils/utils.mk
index 03c22ba7..03c22ba7 100644
--- a/import/chips/p9/utils/utils.mk
+++ b/src/import/chips/p9/utils/utils.mk
diff --git a/import/chips/p9/xip/Makefile b/src/import/chips/p9/xip/Makefile
index b97ffc15..b97ffc15 100644
--- a/import/chips/p9/xip/Makefile
+++ b/src/import/chips/p9/xip/Makefile
diff --git a/import/chips/p9/xip/p9_xip_image.c b/src/import/chips/p9/xip/p9_xip_image.c
index 0f9ce1f7..0f9ce1f7 100644
--- a/import/chips/p9/xip/p9_xip_image.c
+++ b/src/import/chips/p9/xip/p9_xip_image.c
diff --git a/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h
index 09bc1aa5..09bc1aa5 100644
--- a/import/chips/p9/xip/p9_xip_image.h
+++ b/src/import/chips/p9/xip/p9_xip_image.h
diff --git a/import/chips/p9/xip/p9_xip_tool.C b/src/import/chips/p9/xip/p9_xip_tool.C
index dd48e250..dd48e250 100644
--- a/import/chips/p9/xip/p9_xip_tool.C
+++ b/src/import/chips/p9/xip/p9_xip_tool.C
diff --git a/import/hwpf/fapi2/include/buffer.H b/src/import/hwpf/fapi2/include/buffer.H
index 7661a9cd..7661a9cd 100644
--- a/import/hwpf/fapi2/include/buffer.H
+++ b/src/import/hwpf/fapi2/include/buffer.H
diff --git a/import/hwpf/fapi2/include/buffer_parameters.H b/src/import/hwpf/fapi2/include/buffer_parameters.H
index aea03c66..aea03c66 100644
--- a/import/hwpf/fapi2/include/buffer_parameters.H
+++ b/src/import/hwpf/fapi2/include/buffer_parameters.H
diff --git a/import/hwpf/fapi2/include/buffer_traits.H b/src/import/hwpf/fapi2/include/buffer_traits.H
index b14df7ea..b14df7ea 100644
--- a/import/hwpf/fapi2/include/buffer_traits.H
+++ b/src/import/hwpf/fapi2/include/buffer_traits.H
diff --git a/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H
index 9f0e0419..9f0e0419 100644
--- a/import/hwpf/fapi2/include/error_info.H
+++ b/src/import/hwpf/fapi2/include/error_info.H
diff --git a/import/hwpf/fapi2/include/error_info_defs.H b/src/import/hwpf/fapi2/include/error_info_defs.H
index c67e4061..c67e4061 100644
--- a/import/hwpf/fapi2/include/error_info_defs.H
+++ b/src/import/hwpf/fapi2/include/error_info_defs.H
diff --git a/import/hwpf/fapi2/include/error_scope.H b/src/import/hwpf/fapi2/include/error_scope.H
index 1a00386c..1a00386c 100644
--- a/import/hwpf/fapi2/include/error_scope.H
+++ b/src/import/hwpf/fapi2/include/error_scope.H
diff --git a/import/hwpf/fapi2/include/fapi2.H b/src/import/hwpf/fapi2/include/fapi2.H
index 9965e8e5..9965e8e5 100644
--- a/import/hwpf/fapi2/include/fapi2.H
+++ b/src/import/hwpf/fapi2/include/fapi2.H
diff --git a/import/hwpf/fapi2/include/fapi2_attribute_service.H b/src/import/hwpf/fapi2/include/fapi2_attribute_service.H
index 78655961..78655961 100644
--- a/import/hwpf/fapi2/include/fapi2_attribute_service.H
+++ b/src/import/hwpf/fapi2/include/fapi2_attribute_service.H
diff --git a/import/hwpf/fapi2/include/fapi2_error_scope.H b/src/import/hwpf/fapi2/include/fapi2_error_scope.H
index 8a4833ac..8a4833ac 100644
--- a/import/hwpf/fapi2/include/fapi2_error_scope.H
+++ b/src/import/hwpf/fapi2/include/fapi2_error_scope.H
diff --git a/import/hwpf/fapi2/include/fapi2_hw_access.H b/src/import/hwpf/fapi2/include/fapi2_hw_access.H
index 8dc871bb..8dc871bb 100644
--- a/import/hwpf/fapi2/include/fapi2_hw_access.H
+++ b/src/import/hwpf/fapi2/include/fapi2_hw_access.H
diff --git a/import/hwpf/fapi2/include/fapi2_hwp_executor.H b/src/import/hwpf/fapi2/include/fapi2_hwp_executor.H
index 78a18fba..78a18fba 100644
--- a/import/hwpf/fapi2/include/fapi2_hwp_executor.H
+++ b/src/import/hwpf/fapi2/include/fapi2_hwp_executor.H
diff --git a/import/hwpf/fapi2/include/fapi2_multicast.H b/src/import/hwpf/fapi2/include/fapi2_multicast.H
index c83be5bc..c83be5bc 100644
--- a/import/hwpf/fapi2/include/fapi2_multicast.H
+++ b/src/import/hwpf/fapi2/include/fapi2_multicast.H
diff --git a/import/hwpf/fapi2/include/fapi2_multicast_defs.H b/src/import/hwpf/fapi2/include/fapi2_multicast_defs.H
index 6199b4e0..6199b4e0 100644
--- a/import/hwpf/fapi2/include/fapi2_multicast_defs.H
+++ b/src/import/hwpf/fapi2/include/fapi2_multicast_defs.H
diff --git a/import/hwpf/fapi2/include/fapi2_target.H b/src/import/hwpf/fapi2/include/fapi2_target.H
index b41eb477..b41eb477 100644
--- a/import/hwpf/fapi2/include/fapi2_target.H
+++ b/src/import/hwpf/fapi2/include/fapi2_target.H
diff --git a/import/hwpf/fapi2/include/fapi2_vpd_access.H b/src/import/hwpf/fapi2/include/fapi2_vpd_access.H
index d5b946b0..d5b946b0 100644
--- a/import/hwpf/fapi2/include/fapi2_vpd_access.H
+++ b/src/import/hwpf/fapi2/include/fapi2_vpd_access.H
diff --git a/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H
index 82483d54..82483d54 100644
--- a/import/hwpf/fapi2/include/ffdc.H
+++ b/src/import/hwpf/fapi2/include/ffdc.H
diff --git a/import/hwpf/fapi2/include/hw_access_def.H b/src/import/hwpf/fapi2/include/hw_access_def.H
index 9d67961c..9d67961c 100644
--- a/import/hwpf/fapi2/include/hw_access_def.H
+++ b/src/import/hwpf/fapi2/include/hw_access_def.H
diff --git a/import/hwpf/fapi2/include/mvpd_access.H b/src/import/hwpf/fapi2/include/mvpd_access.H
index 532b32ee..532b32ee 100644
--- a/import/hwpf/fapi2/include/mvpd_access.H
+++ b/src/import/hwpf/fapi2/include/mvpd_access.H
diff --git a/import/hwpf/fapi2/include/mvpd_access_defs.H b/src/import/hwpf/fapi2/include/mvpd_access_defs.H
index a1a4aaff..a1a4aaff 100644
--- a/import/hwpf/fapi2/include/mvpd_access_defs.H
+++ b/src/import/hwpf/fapi2/include/mvpd_access_defs.H
diff --git a/import/hwpf/fapi2/include/plat/hw_access.H b/src/import/hwpf/fapi2/include/plat/hw_access.H
index fbe8ae6e..fbe8ae6e 100644
--- a/import/hwpf/fapi2/include/plat/hw_access.H
+++ b/src/import/hwpf/fapi2/include/plat/hw_access.H
diff --git a/import/hwpf/fapi2/include/plat/plat_error_scope.H b/src/import/hwpf/fapi2/include/plat/plat_error_scope.H
index 4b198a10..4b198a10 100644
--- a/import/hwpf/fapi2/include/plat/plat_error_scope.H
+++ b/src/import/hwpf/fapi2/include/plat/plat_error_scope.H
diff --git a/import/hwpf/fapi2/include/plat/plat_hw_access.H b/src/import/hwpf/fapi2/include/plat/plat_hw_access.H
index 10f162b4..10f162b4 100644
--- a/import/hwpf/fapi2/include/plat/plat_hw_access.H
+++ b/src/import/hwpf/fapi2/include/plat/plat_hw_access.H
diff --git a/import/hwpf/fapi2/include/plat/plat_target.H b/src/import/hwpf/fapi2/include/plat/plat_target.H
index 4712cda5..4712cda5 100644
--- a/import/hwpf/fapi2/include/plat/plat_target.H
+++ b/src/import/hwpf/fapi2/include/plat/plat_target.H
diff --git a/import/hwpf/fapi2/include/plat/plat_trace.H b/src/import/hwpf/fapi2/include/plat/plat_trace.H
index fbd3aef6..fbd3aef6 100644
--- a/import/hwpf/fapi2/include/plat/plat_trace.H
+++ b/src/import/hwpf/fapi2/include/plat/plat_trace.H
diff --git a/import/hwpf/fapi2/include/plat/plat_vpd_access.H b/src/import/hwpf/fapi2/include/plat/plat_vpd_access.H
index 5ca078a8..5ca078a8 100644
--- a/import/hwpf/fapi2/include/plat/plat_vpd_access.H
+++ b/src/import/hwpf/fapi2/include/plat/plat_vpd_access.H
diff --git a/import/hwpf/fapi2/include/plat/target.H b/src/import/hwpf/fapi2/include/plat/target.H
index 842d9d1f..842d9d1f 100644
--- a/import/hwpf/fapi2/include/plat/target.H
+++ b/src/import/hwpf/fapi2/include/plat/target.H
diff --git a/import/hwpf/fapi2/include/plat/vpd_access.H b/src/import/hwpf/fapi2/include/plat/vpd_access.H
index 554a3469..554a3469 100644
--- a/import/hwpf/fapi2/include/plat/vpd_access.H
+++ b/src/import/hwpf/fapi2/include/plat/vpd_access.H
diff --git a/import/hwpf/fapi2/include/return_code.H b/src/import/hwpf/fapi2/include/return_code.H
index f5569dc2..f5569dc2 100644
--- a/import/hwpf/fapi2/include/return_code.H
+++ b/src/import/hwpf/fapi2/include/return_code.H
diff --git a/import/hwpf/fapi2/include/return_code_defs.H b/src/import/hwpf/fapi2/include/return_code_defs.H
index c7c95f09..c7c95f09 100644
--- a/import/hwpf/fapi2/include/return_code_defs.H
+++ b/src/import/hwpf/fapi2/include/return_code_defs.H
diff --git a/import/hwpf/fapi2/include/target_states.H b/src/import/hwpf/fapi2/include/target_states.H
index be29cb28..be29cb28 100644
--- a/import/hwpf/fapi2/include/target_states.H
+++ b/src/import/hwpf/fapi2/include/target_states.H
diff --git a/import/hwpf/fapi2/include/target_types.H b/src/import/hwpf/fapi2/include/target_types.H
index 3e852a1e..3e852a1e 100644
--- a/import/hwpf/fapi2/include/target_types.H
+++ b/src/import/hwpf/fapi2/include/target_types.H
diff --git a/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H
index e4f5fa09..e4f5fa09 100644
--- a/import/hwpf/fapi2/include/utils.H
+++ b/src/import/hwpf/fapi2/include/utils.H
diff --git a/import/hwpf/fapi2/include/variable_buffer.H b/src/import/hwpf/fapi2/include/variable_buffer.H
index e32c69e7..e32c69e7 100644
--- a/import/hwpf/fapi2/include/variable_buffer.H
+++ b/src/import/hwpf/fapi2/include/variable_buffer.H
diff --git a/import/hwpf/fapi2/include/variable_buffer_utils.H b/src/import/hwpf/fapi2/include/variable_buffer_utils.H
index b1ae4664..b1ae4664 100644
--- a/import/hwpf/fapi2/include/variable_buffer_utils.H
+++ b/src/import/hwpf/fapi2/include/variable_buffer_utils.H
diff --git a/import/hwpf/fapi2/include/vpd_access_defs.H b/src/import/hwpf/fapi2/include/vpd_access_defs.H
index 57d51e13..57d51e13 100644
--- a/import/hwpf/fapi2/include/vpd_access_defs.H
+++ b/src/import/hwpf/fapi2/include/vpd_access_defs.H
diff --git a/import/hwpf/fapi2/tools/parseErrorInfo.pl b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl
index 8a431d1b..8a431d1b 100755
--- a/import/hwpf/fapi2/tools/parseErrorInfo.pl
+++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl
diff --git a/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
index 116c209a..116c209a 100644
--- a/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/chip_attributes.xml
diff --git a/import/tools/imageProcs/fapi_sbe_common.H b/src/import/tools/imageProcs/fapi_sbe_common.H
index 3c29b7f4..3c29b7f4 100644
--- a/import/tools/imageProcs/fapi_sbe_common.H
+++ b/src/import/tools/imageProcs/fapi_sbe_common.H
diff --git a/src/tools/utils/sbePatchUtility.py b/src/tools/utils/sbePatchUtility.py
index d5af8fa1..552c035d 100644
--- a/src/tools/utils/sbePatchUtility.py
+++ b/src/tools/utils/sbePatchUtility.py
@@ -95,7 +95,7 @@ def utilPatchSimics(i_sandbox_path, i_sandbox_root):
 
     # Ge the ppe root
     ppe_base = utilcode.utilFind_ENV_string("SBEROOT").rstrip('\n')
-    ppe_path = ppe_base + "/import/chips/p9/sw_simulation/"
+    ppe_path = ppe_base + "/src/import/chips/p9/sw_simulation/"
     p_cmd = "cp -f " + ppe_path + "*  " + sandbox_path
     print "  * Executing : ",p_cmd
     rc = os.system(p_cmd)