4 files changed, 19 insertions, 28 deletions
diff --git a/src/usr/isteps/istep10/makefile b/src/usr/isteps/istep10/makefile
index 965ac8189..78bbf578c 100644
--- a/src/usr/isteps/istep10/makefile
+++ b/src/usr/isteps/istep10/makefile
@@ -29,7 +29,12 @@ NEST_HWP_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/nest
 INITFILES_HWP_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/initfiles
 PERV_HWP_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv
 PROCEDURES_PATH += ${ROOTPATH}/src/import/chips/p9/procedures
+XIP_CUSTOMIZE_PATH = ${PROCEDURES_PATH}/hwp/customize
+HWP_ACC_PATH += ${PROCEDURES_PATH}/hwp/accessors
 
+
+EXTRAINCDIR += ${HWP_ACC_PATH}
+EXTRAINCDIR += ${XIP_CUSTOMIZE_PATH}
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/pm/
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/io/
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/lib/
@@ -40,10 +45,12 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/xip
 EXTRAINCDIR += ${NEST_HWP_PATH}
 EXTRAINCDIR += ${INITFILES_HWP_PATH}
 EXTRAINCDIR += ${PERV_HWP_PATH}
 
+
 OBJS += call_proc_build_smp.o
 OBJS += call_host_slave_sbe_update.o
 OBJS += call_proc_cen_ref_clk_enable.o
@@ -72,9 +79,10 @@ OBJS+=p9_build_smp_adu.o
 VPATH += ${NEST_HWP_PATH}
 VPATH += ${INITFILES_HWP_PATH}
 VPATH += ${PERV_HWP_PATH}
-VPATH += ${PROCEDURES_PATH}/hwp/io/
-VPATH += ${PROCEDURES_PATH}/hwp/pm/
-VPATH += ${PROCEDURES_PATH}/hwp/lib/
+VPATH += ${PROCEDURES_PATH}/hwp/io
+VPATH += ${PROCEDURES_PATH}/hwp/pm
+VPATH += ${PROCEDURES_PATH}/hwp/lib
+VPATH+=  ${HWP_ACC_PATH}
 
 #Required include before all the procedure.mk are included
 include ${ROOTPATH}/procedure.rules.mk
diff --git a/src/usr/isteps/istep11/makefile b/src/usr/isteps/istep11/makefile
index b74598978..f6415a01a 100644
--- a/src/usr/isteps/istep11/makefile
+++ b/src/usr/isteps/istep11/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -57,9 +57,12 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps/
 EXTRAINCDIR += ${HWP_PATH}
 #EXTRAINCDIR += $(PROCEDURES_PATH)/hwp/nest/
 
+XIPPATH = ${ROOTPATH}/src/import/chips/p9/xip
+
 VPATH += $(PROCEDURES_PATH)/hwp/nest ${ROOTPATH}/src/usr/fapi2
 VPATH += ${ROOTPATH}/src/usr/sbe
 VPATH += ${ROOTPATH}/src/import/chips/centaur/procedures/hwp/perv
+VPATH += ${XIPPATH}
 
 #Required include before all the procedure.mk are included
 include ${ROOTPATH}/procedure.rules.mk
diff --git a/src/usr/isteps/pm/pm.mk b/src/usr/isteps/pm/pm.mk
index b82963d34..55e15b1fb 100644
--- a/src/usr/isteps/pm/pm.mk
+++ b/src/usr/isteps/pm/pm.mk
@@ -31,24 +31,17 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/pmlib/include/registers/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/customize/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm/include/registers/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/utils/stopreg/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/xip
 
 HWP_LIB_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/
 HWP_PM_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm
 EXTRAINCDIR += ${HWP_PM_PATH}
-HWP_CUST_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/customize
-EXTRAINCDIR += ${HWP_CUST_PATH}
-HWP_ACC_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/accessors
-EXTRAINCDIR += ${HWP_ACC_PATH}
-HWP_XIP_PATH += ${ROOTPATH}/src/import/chips/p9/xip
-EXTRAINCDIR += ${HWP_XIP_PATH}
-HWP_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
-HWP_CEN_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/centaur/utils/imageProcs/
-HWP_COMMON_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
 HWP_STOPUTIL_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/utils/stopreg/
 EXTRAINCDIR += ${HWP_STOPUTIL_PATH}
 NEST_UTIL_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/nest
@@ -74,8 +67,8 @@ OBJS += p9_setup_evid.o
 OBJS += p9_avsbus_lib.o
 
 ##  NOTE: add a new directory onto the vpaths when you add a new HWP
-VPATH += ${HWP_PM_PATH} ${HWP_CUST_PATH} ${HWP_ACC_PATH} ${HWP_LIB_PATH}
-VPATH += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH} ${HWP_CEN_IMAGEPROCS_PATH} ${HWP_COMMON_IMAGEPROCS_PATH} ${HWP_STOPUTIL_PATH}
+VPATH += ${HWP_PM_PATH} ${HWP_CUST_PATH} ${HWP_ACC_PATH}
+VPATH += ${HWP_LIB_PATH} ${HWP_STOPUTIL_PATH}
 VPATH += ${NEST_UTIL_PATH}
 
 # TODO RTC: 164237
@@ -106,19 +99,8 @@ include ${HWP_PM_PATH}/p9_pm_occ_gpe_init.mk
 include ${HWP_PM_PATH}/p9_pm_ppm_firinit.mk
 include ${HWP_PM_PATH}/p9_pm_ocb_indir_setup_circular.mk
 include ${HWP_PM_PATH}/p9_scan_ring_util.mk
-include ${HWP_CUST_PATH}/p9_xip_customize.mk
-include ${HWP_ACC_PATH}/p9_get_mvpd_ring.mk
-include ${HWP_ACC_PATH}/p9_mvpd_ring_funcs.mk
-include ${HWP_XIP_PATH}/p9_xip_image.mk
-include ${HWP_IMAGEPROCS_PATH}/p9_dd_container.mk
-include ${HWP_IMAGEPROCS_PATH}/p9_tor.mk
-include ${HWP_IMAGEPROCS_PATH}/p9_ring_identification.mk
-include ${HWP_IMAGEPROCS_PATH}/p9_ringId.mk
-include ${HWP_CEN_IMAGEPROCS_PATH}/cen_ringId.mk
-include ${HWP_COMMON_IMAGEPROCS_PATH}/common_ringId.mk
 include ${HWP_STOPUTIL_PATH}/p9_stop_util.mk
 include ${HWP_STOPUTIL_PATH}/p9_stop_api.mk
-include ${HWP_IMAGEPROCS_PATH}/p9_scan_compression.mk
 include ${HWP_PM_PATH}/p9_pstate_parameter_block.mk
 include ${HWP_PM_PATH}/p9_pm_get_poundv_bucket.mk
 include ${HWP_PM_PATH}/p9_pm_pstate_gpe_init.mk
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index 0847cbde0..0810b7f54 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -69,8 +69,6 @@
 #include <p9_hcode_image_build.H>
 
 #include <p9_hcode_image_defines.H>
-#include <p9_xip_image.h>
-
 
 #include <arch/ppc.H>
 #include <isteps/pm/occAccess.H>