9 files changed, 83 insertions, 48 deletions
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index c37b85712..821759bcf 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.H
@@ -150,6 +150,7 @@ namespace   INITSERVICE
 const DepModInfo g_istep07Dependancies = {
     {
         DEP_LIB(libistep07.so),
+        DEP_LIB(libisteps_mss.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 2cb5fbd18..2f25f2ee0 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -259,6 +259,7 @@ const   TaskInfo    g_istep13[]  =   {
 const DepModInfo g_istep13Dependancies = {
     {
         DEP_LIB(libistep13.so),
+        DEP_LIB(libisteps_mss.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index 56d58e48f..ddb0d8358 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -180,6 +180,7 @@ const DepModInfo g_istep14Dependancies = {
     {
         DEP_LIB(libistep14.so),
         DEP_LIB(libdump.so),
+        DEP_LIB(libisteps_mss.so),
         NULL
     }
 };
diff --git a/src/makefile b/src/makefile
index c64f4a83d..a1ec8ae58 100644
--- a/src/makefile
+++ b/src/makefile
@@ -178,6 +178,7 @@ EXTENDED_MODULES += $(if $(CONFIG_CONSOLE_OUTPUT_ERRORDISPLAY),errldisplay)
 EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmi)
 EXTENDED_MODULES += xz
 EXTENDED_MODULES += p9_stop_util
+EXTENDED_MODULES += isteps_mss
 
 
 #***************************************
diff --git a/src/usr/isteps/istep07/makefile b/src/usr/isteps/istep07/makefile
index 426167bcb..dad212312 100644
--- a/src/usr/isteps/istep07/makefile
+++ b/src/usr/isteps/istep07/makefile
@@ -33,21 +33,6 @@ OBJS += call_mss_freq.o
 OBJS += call_mss_eff_config.o
 OBJS += call_mss_attr_update.o
 
-# library objects needed
-OBJS += spd_decoder.o
-OBJS += fake_spd.o
-OBJS += fake_vpd.o
-OBJS += c_str.o
-OBJS += memory_size.o
-OBJS += attr_setters.o
-OBJS += cas_latency.o
-OBJS += eff_config.o
-OBJS += timing.o
-OBJS += rank.o
-OBJS += sync.o
-
-
-
 #Add all the extra include paths
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/sbe/
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 508f3df27..cad151156 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -61,30 +61,6 @@ OBJS += call_mss_draminit_training.o
 OBJS += call_mss_draminit_trainadv.o
 OBJS += call_mss_draminit_mc.o
 
-#From import/chips/p9/procedures/hwp/memory/lib
-OBJS += rank.o
-OBJS += c_str.o
-OBJS += ccs.o
-OBJS += rcd_load.o
-OBJS += mrs_load.o
-OBJS += mrs_load_ddr4.o
-OBJS += rcd_load_ddr4.o
-OBJS += ddr_phy.o
-OBJS += dp16.o
-OBJS += adr32s.o
-OBJS += xlate.o
-OBJS += port.o
-OBJS += memdiags_fir.o
-OBJS += mrs00.o
-OBJS += mrs01.o
-OBJS += mrs02.o
-OBJS += mrs03.o
-OBJS += mrs04.o
-OBJS += mrs05.o
-OBJS += mrs06.o
-
-
-
 OBJS += $(if $(CONFIG_OPENPOWER_VDDR),openpower_vddr.o,hbVddrMsg.o)
 
 #HWP build tool
diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile
index 6b9a1a5f1..836edad78 100644
--- a/src/usr/isteps/istep14/makefile
+++ b/src/usr/isteps/istep14/makefile
@@ -50,15 +50,6 @@ OBJS += call_proc_setup_bars.o
 OBJS += call_proc_htm_setup.o
 OBJS += call_proc_exit_cache_contained.o
 OBJS += call_host_mpipl_service.o
-OBJS += memdiags.o
-OBJS += mcbist.o
-OBJS += sim.o
-OBJS += rank.o
-OBJS += patterns.o
-
-#Object files from lib directories
-OBJS += memory_size.o
-OBJS += c_str.o
 
 include ${ROOTPATH}/procedure.rules.mk
 include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk
diff --git a/src/usr/isteps/makefile b/src/usr/isteps/makefile
index 9fd69913a..1a448a9c5 100644
--- a/src/usr/isteps/makefile
+++ b/src/usr/isteps/makefile
@@ -40,6 +40,7 @@ SUBDIRS+=istep20.d
 SUBDIRS+=istep21.d
 SUBDIRS+=pm.d
 SUBDIRS += p9_stop_util.d
+SUBDIRS += mss.d
 
 OBJS += hwpisteperror.o
 OBJS += hwpistepud.o
diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile
new file mode 100644
index 000000000..0a96f1063
--- /dev/null
+++ b/src/usr/isteps/mss/makefile
@@ -0,0 +1,78 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/isteps/mss/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+# [+] 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 = ../../../..
+
+PROCEDURES_PATH    = ${ROOTPATH}/src/import/chips/p9/procedures
+
+#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/p9/common/include
+
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/ccs/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/ddr4/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/ecc/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/eff_config/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/fir/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/freq/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/mcbist/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/phy/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/spd/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/termination/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/utils/
+
+# Add common and generated parts to object list.
+
+MSS_PATH := $(PROCEDURES_PATH)/hwp/memory/lib
+MSS_SOURCE := $(shell find $(MSS_PATH) -name '*.C' -exec basename {} \;)
+MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_SOURCE))
+
+MODULE = isteps_mss
+OBJS += $(MSS_MODULE_OBJS)
+$(call BUILD_MODULE)
+
+#HWP build tool
+include ${ROOTPATH}/procedure.rules.mk
+include ${ROOTPATH}/config.mk
+
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/ccs/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/dimm/ddr4
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/ecc/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/eff_config/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/fir/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/freq/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/mcbist/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/phy/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/spd/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/termination/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/utils/