PRD: added IO procedure support for HBRT

Change-Id: I004650d3ae876e48b84c30bb2d12917b767ac517
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14383
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 84 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 384632979..52c97e3b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 *.gcno
 *.gcda
 *.gcov
-*.swp
+*.sw*
 customrc
 *.CKP
 *.log
diff --git a/src/makefile b/src/makefile
index 4de53b53e..8c74f48b7 100644
--- a/src/makefile
+++ b/src/makefile
@@ -232,6 +232,7 @@ RUNTIME_MODULES += build_winkle_images_rt
 RUNTIME_MODULES += occ_rt
 RUNTIME_MODULES += $(if $(CONFIG_HTMGT),htmgt_rt)
 RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),prdf_rt)
+RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),bus_training_rt)
 
 RUNTIME_DATA_MODULES +=
 RUNTIME_TESTCASE_MODULES += cxxtest_rt
diff --git a/src/usr/hwpf/hwp/bus_training/io_hwp_common_ipl_and_rt.mk b/src/usr/hwpf/hwp/bus_training/io_hwp_common_ipl_and_rt.mk
new file mode 100644
index 000000000..d54f4f551
--- /dev/null
+++ b/src/usr/hwpf/hwp/bus_training/io_hwp_common_ipl_and_rt.mk
@@ -0,0 +1,41 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/hwpf/hwp/bus_training/io_hwp_common_ipl_and_rt.mk $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2014
+# [+] 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 must be defined before including this file.
+
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
+
+OBJS += gcr_funcs.o
+OBJS += io_power_down_lanes.o
+OBJS += io_read_erepair.o
+OBJS += io_clear_firs.o
+OBJS += io_fir_isolation.o
+OBJS += erepairAccessorHwpFuncs.o
+OBJS += erepairGetFailedLanesHwp.o
+OBJS += erepairSetFailedLanesHwp.o
+
diff --git a/src/usr/hwpf/hwp/bus_training/makefile b/src/usr/hwpf/hwp/bus_training/makefile
index fbdec4836..dfd36e634 100644
--- a/src/usr/hwpf/hwp/bus_training/makefile
+++ b/src/usr/hwpf/hwp/bus_training/makefile
@@ -27,30 +27,23 @@ ROOTPATH = ../../../../..
 
 MODULE = bus_training
 
+SUBDIRS += runtime.d
+
+# ROOTPATH must be defined before including this file.
+include io_hwp_common_ipl_and_rt.mk
+
 ##      support for Targeting and fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/nest_chiplets/proc_a_x_pci_dmi_pll_setup
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/bus_training
 
 ## pointer to common HWP files
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
 
-OBJS += gcr_funcs.o
 OBJS += io_funcs.o
 OBJS += io_run_training.o
 OBJS += pbusLinkSvc.o
 OBJS += io_dccal.o
-OBJS += io_power_down_lanes.o
-OBJS += io_read_erepair.o
-OBJS += io_clear_firs.o
-OBJS += io_fir_isolation.o
 OBJS += io_restore_erepair.o
-OBJS += erepairAccessorHwpFuncs.o
-OBJS += erepairGetFailedLanesHwp.o
-OBJS += erepairSetFailedLanesHwp.o
 OBJS += io_post_trainadv.o
 OBJS += io_pre_trainadv.o
 
diff --git a/src/usr/hwpf/hwp/bus_training/runtime/makefile b/src/usr/hwpf/hwp/bus_training/runtime/makefile
new file mode 100644
index 000000000..82ea1db91
--- /dev/null
+++ b/src/usr/hwpf/hwp/bus_training/runtime/makefile
@@ -0,0 +1,36 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/hwpf/hwp/bus_training/runtime/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2014
+# [+] 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 = bus_training_rt
+
+VPATH += ..
+EXTRAINCDIR += ..
+
+# ROOTPATH must be defined before including this file.
+include ../io_hwp_common_ipl_and_rt.mk
+
+include ${ROOTPATH}/config.mk