Introduce new shared library for image processing fucntions

    -Moved xip functions from pm lib into libimageprocs.so
    -Updated DEPLIBS to include new libimageprocs.so for istep
     libs.

Change-Id: I9e1c90643448146f6e8ef953106c0eea521e35f0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51754
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
CI-Ready: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

9 files changed, 161 insertions, 47 deletions

diff --git a/src/usr/imageprocs/imageprocs.mk b/src/usr/imageprocs/imageprocs.mk
new file mode 100644
index 000000000..1cf436072
--- /dev/null
+++ b/src/usr/imageprocs/imageprocs.mk
@@ -0,0 +1,70 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/imageprocs/imageprocs.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+# xip image processing functions
+HWP_XIP_PATH := ${ROOTPATH}/src/import/chips/p9/xip
+
+# p9 ring id
+HWP_IMAGEPROCS_PATH := ${ROOTPATH}/src/import/chips/p9/utils/imageProcs
+
+# centaur ring id
+HWP_CEN_IMAGEPROCS_PATH += \
+		${ROOTPATH}/src/import/chips/centaur/utils/imageProcs
+
+# common ring id
+HWP_COMMON_IMAGEPROCS_PATH += \
+		 ${ROOTPATH}/src/import/chips/common/utils/imageProcs
+
+# xip customize path
+XIP_CUSTOMIZE_PATH = ${ROOTPATH}/src/import/chips/p9/procedures/hwp/customize
+
+# vpd accesssors
+HWP_ACC_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/accessors
+
+VPATH += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH} ${HWP_CEN_IMAGEPROCS_PATH} \
+		 ${HWP_COMMON_IMAGEPROCS_PATH} ${HWP_STOPUTIL_PATH}
+VPATH += ${XIP_CUSTOMIZE_PATH} ${HWP_ACC_PATH}
+
+EXTRAINCDIR += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH}
+EXTRAINCDIR += ${HWP_CEN_IMAGEPROCS_PATH} ${HWP_COMMON_IMAGEPROCS_PATH}
+EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
+EXTRAINCDIR += ${XIP_CUSTOMIZE_PATH}
+EXTRAINCDIR += ${HWP_ACC_PATH}
+
+include ${ROOTPATH}/procedure.rules.mk
+
+include ${XIP_CUSTOMIZE_PATH}/p9_xip_customize.mk
+include ${XIP_CUSTOMIZE_PATH}/p9_xip_section_append.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_IMAGEPROCS_PATH}/p9_scan_compression.mk
+include ${HWP_ACC_PATH}/p9_get_mvpd_ring.mk
+include ${HWP_ACC_PATH}/p9_mvpd_ring_funcs.mk
+
diff --git a/src/usr/imageprocs/makefile b/src/usr/imageprocs/makefile
new file mode 100644
index 000000000..f84d3f66f
--- /dev/null
+++ b/src/usr/imageprocs/makefile
@@ -0,0 +1,33 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/imageprocs/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../..
+
+MODULE = imageprocs
+
+SUBDIRS += runtime.d
+
+include imageprocs.mk
+
+include ${ROOTPATH}/config.mk
diff --git a/src/usr/imageprocs/runtime/makefile b/src/usr/imageprocs/runtime/makefile
new file mode 100644
index 000000000..d07b16915
--- /dev/null
+++ b/src/usr/imageprocs/runtime/makefile
@@ -0,0 +1,35 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/imageprocs/runtime/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+HOSTBOOT_RUNTIME = 1
+
+ROOTPATH = ../../../..
+
+MODULE = imageprocs_rt
+
+VPATH += ../
+
+include ../imageprocs.mk
+
+include ${ROOTPATH}/config.mk
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>
diff --git a/src/usr/makefile b/src/usr/makefile
index f0a4d00ae..af52ef1d1 100644
--- a/src/usr/makefile
+++ b/src/usr/makefile
@@ -57,6 +57,7 @@ SUBDIRS += ibscom.d
 SUBDIRS += dump.d
 SUBDIRS += secureboot.d
 SUBDIRS += sbe.d
+SUBDIRS += imageprocs.d
 SUBDIRS += sbeio.d
 SUBDIRS += gpio.d
 SUBDIRS += lpc.d
diff --git a/src/usr/sbe/makefile b/src/usr/sbe/makefile
index a8abf2d85..f1e4b63fb 100644
--- a/src/usr/sbe/makefile
+++ b/src/usr/sbe/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2013,2017
+# Contributors Listed Below - COPYRIGHT 2013,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -28,6 +28,7 @@ MODULE = sbe
 ##      support for fapi2
 EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
+EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/
 
 ## pointer to common HWP files
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
@@ -36,6 +37,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/utils/stopreg/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc
 HWP_CUSTOMIZE_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/customize
 EXTRAINCDIR += ${HWP_CUSTOMIZE_PATH}/
 HWP_ACCESSORS_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/accessors
@@ -50,23 +52,5 @@ OBJS += sbe_update.o
 
 SUBDIRS += test.d
 
-##  NOTE: add a new directory onto the vpaths when you add a new HWP
-VPATH += ${HWP_CUSTOMIZE_PATH} ${HWP_ACCESSORS_PATH} ${HWP_XIP_PATH}
-VPATH += ${UTILS_PATH} ${CEN_UTILS_PATH} ${COMMON_UTILS_PATH}
-
-include ${ROOTPATH}/procedure.rules.mk
-
-include ${UTILS_PATH}/p9_dd_container.mk
-include ${HWP_CUSTOMIZE_PATH}/p9_xip_customize.mk
-include ${HWP_CUSTOMIZE_PATH}/p9_xip_section_append.mk
-include ${HWP_ACCESSORS_PATH}/p9_get_mvpd_ring.mk
-include ${HWP_ACCESSORS_PATH}/p9_mvpd_ring_funcs.mk
-include ${HWP_XIP_PATH}/p9_xip_image.mk
-include ${UTILS_PATH}/p9_ring_identification.mk
-include ${UTILS_PATH}/p9_ringId.mk
-include ${CEN_UTILS_PATH}/cen_ringId.mk
-include ${COMMON_UTILS_PATH}/common_ringId.mk
-include ${UTILS_PATH}/p9_scan_compression.mk
-include ${UTILS_PATH}/p9_tor.mk
 
 include ${ROOTPATH}/config.mk