3 files changed, 105 insertions, 8 deletions
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk
index 73168a875..72ef8880d 100644
--- a/src/usr/diag/prdf/prdf_hb_only.mk
+++ b/src/usr/diag/prdf/prdf_hb_only.mk
@@ -218,12 +218,5 @@ prd_vpath += ${ROOTPATH}/src/import/generic/memory/lib/utils/
 prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/
 prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/
 
-prd_obj_no_sim += c_str.o
-prd_obj_no_sim += mcbist.o
-prd_obj_no_sim += mcbist_workarounds.o
-prd_obj_no_sim += sim.o
-prd_obj_no_sim += rank.o
-prd_obj_no_sim += memory_size.o
-prd_obj_no_sim += patterns.o
 
 endif
diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile
index 5de8b8281..da8af126c 100644
--- a/src/usr/isteps/mss/makefile
+++ b/src/usr/isteps/mss/makefile
@@ -145,8 +145,12 @@ MODULE = isteps_mss
 OBJS += $(MSS_MODULE_OBJS)
 $(call BUILD_MODULE)
 
+VPATH += ${MSS_LIB}
+
+SUBDIRS += runtime
+
 #HWP build tool
 include ${ROOTPATH}/procedure.rules.mk
 include ${ROOTPATH}/config.mk
 
-VPATH += ${MSS_LIB}
+
diff --git a/src/usr/isteps/mss/runtime/makefile b/src/usr/isteps/mss/runtime/makefile
new file mode 100644
index 000000000..400025498
--- /dev/null
+++ b/src/usr/isteps/mss/runtime/makefile
@@ -0,0 +1,100 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/isteps/mss/runtime/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2019
+# [+] 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
+
+MODULE = mss_rt
+
+ROOTPATH = ../../../../..
+
+IMPORT_PATH        = ${ROOTPATH}/src/import
+PROCEDURES_PATH    = ${IMPORT_PATH}/chips/p9/procedures
+
+include ${ROOTPATH}/src/build/mkrules/script.rules.mk
+include ${ROOTPATH}/src/build/mkrules/verbose.rules.mk
+
+#Add all the extra include paths
+EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
+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 += ${IMPORT_PATH}/
+
+# Generic support
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/ccs/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/ddr4/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/ecc/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/eff_config/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/fir/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/freq/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/mcbist/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/phy/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/power_thermal/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/spd/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/utils/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/workarounds/
+MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/rosetta_map/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/spd/lrdimm/ddr4/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/spd/rdimm/ddr4/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/spd/common/ddr4/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/spd/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/utils/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/utils/shared/
+MSS_LIB += ${IMPORT_PATH}/generic/memory/lib/utils/freq/
+
+# Axone
+MSS_LIB += ${IMPORT_PATH}/chips/p9a/procedures/hwp/memory/lib/utils/
+
+# Nimbus
+MSS_LIB += ${IMPORT_PATH}/chips/p9/procedures/hwp/memory/lib/utils/
+
+EXTRAINCDIR += ${MSS_LIB}
+
+VPATH += ${MSS_LIB}
+
+#######
+# Add the specific files we need for HBRT
+OBJS += c_str.o
+OBJS += axone_c_str.o
+OBJS += nimbus_c_str.o
+OBJS += mcbist.o
+OBJS += mcbist_workarounds.o
+OBJS += sim.o
+OBJS += rank.o
+OBJS += memory_size.o
+OBJS += patterns.o
+OBJS += axone_pos.o
+OBJS += nimbus_pos.o
+
+
+
+#HWP build tool
+include ${ROOTPATH}/procedure.rules.mk
+include ${ROOTPATH}/config.mk