13 files changed, 617 insertions, 36 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index f83fab18..9bba17d6 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -62,41 +62,30 @@ LIB_DIRS += -L$(OBJDIR)/utils
 UTILSLIB := $(OBJDIR)/utils/libutils.a
 LLIBS += -lutils
 
-# Common Cache HWP Exit library
-SUBDIRS += $(CACHE_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/cache
-CACHELIB := $(OBJDIR)/cache/libcache.a
-LLIBS += -lcache
-
-# Common Core libraries
-SUBDIRS += $(CORE_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/core
-CORELIB := $(OBJDIR)/core/libcore.a
-LLIBS += -lcore
-
-# Common Perv libraries
-SUBDIRS += $(PERV_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/perv
-PERVLIB := $(OBJDIR)/perv/libperv.a
-LLIBS += -lperv
-
-# Common Nest libraries
-SUBDIRS += $(NEST_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/nest
-NESTLIB := $(OBJDIR)/nest/libnest.a
-LLIBS += -lnest
-
-# Initfiles library
-SUBDIRS += $(INITFILES_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/initfiles
-INITFILESLIB := $(OBJDIR)/initfiles/libinitfiles.a
-LLIBS += -linitfiles
-
-# Common Pm libraries
-SUBDIRS += $(PM_SRCDIR)
-LIB_DIRS += -L$(OBJDIR)/pm
-PMLIB := $(OBJDIR)/pm/libpm.a
-LLIBS += -lpm
+SUBDIRS += $(ISTEP2_INFRA_DIR)
+LIB_DIRS += -L$(OBJDIR-ISTEP2)
+ISTEP2LIB := $(OBJDIR-ISTEP2)/libistep2.a
+LLIBS += -listep2
+
+SUBDIRS += $(ISTEP3_INFRA_DIR)
+LIB_DIRS += -L$(OBJDIR-ISTEP3)
+ISTEP3LIB := $(OBJDIR-ISTEP3)/libistep3.a
+LLIBS += -listep3
+
+SUBDIRS += $(ISTEP4_INFRA_DIR)
+LIB_DIRS += -L$(OBJDIR-ISTEP4)
+ISTEP4LIB := $(OBJDIR-ISTEP4)/libistep4.a
+LLIBS += -listep4
+
+SUBDIRS += $(ISTEP5_INFRA_DIR)
+LIB_DIRS += -L$(OBJDIR-ISTEP5)
+ISTEP5LIB := $(OBJDIR-ISTEP5)/libistep5.a
+LLIBS += -listep5
+
+SUBDIRS += $(ISTEPCOMMON_INFRA_DIR)
+LIB_DIRS += -L$(OBJDIR-ISTEPCOMMON)
+ISTEPCOMMON := $(OBJDIR-ISTEPCOMMON)/libistepcommon.a
+LLIBS += -listepcommon
 
 SIMICS_PPE_TAR_FILES += $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out
 SIMICS_PPE_TAR_FILES += $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).map
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index 999d7105..ec099f4b 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -91,6 +91,26 @@ ifndef LINKER_DIR
 export LINKER_DIR = $(BUILD_DIR)/linkerscripts
 endif
 
+ifndef ISTEP2_INFRA_DIR
+export ISTEP2_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep2
+endif
+
+ifndef ISTEP3_INFRA_DIR
+export ISTEP3_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep3
+endif
+
+ifndef ISTEP4_INFRA_DIR
+export ISTEP4_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep4
+endif
+
+ifndef ISTEP5_INFRA_DIR
+export ISTEP5_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istep5
+endif
+
+ifndef ISTEPCOMMON_INFRA_DIR
+export ISTEPCOMMON_INFRA_DIR = $(BUILD_DIR)/import_hwp_mk/istepcommon
+endif
+
 ifndef BOOT_SRCDIR
 export BOOT_SRCDIR = $(SBE_SRC_DIR)/boot
 endif
@@ -236,6 +256,26 @@ ifndef FAPI2_TOOLS_DIR
 export FAPI2_TOOLS_DIR = $(IMPORT_SRCDIR)/hwpf/fapi2/tools/
 endif
 
+ifndef OBJDIR-ISTEP2
+export OBJDIR-ISTEP2 = $(BASE_OBJDIR)/istep2
+endif
+
+ifndef OBJDIR-ISTEP3
+export OBJDIR-ISTEP3 = $(BASE_OBJDIR)/istep3
+endif
+
+ifndef OBJDIR-ISTEP4
+export OBJDIR-ISTEP4 = $(BASE_OBJDIR)/istep4
+endif
+
+ifndef OBJDIR-ISTEP5
+export OBJDIR-ISTEP5 = $(BASE_OBJDIR)/istep5
+endif
+
+ifndef OBJDIR-ISTEPCOMMON
+export OBJDIR-ISTEPCOMMON = $(BASE_OBJDIR)/istepcommon
+endif
+
 GCC-TOOL-PATH = $(CTEPATH)/tools/ppetools/prod
 
 # This is used for op-build
diff --git a/src/build/import_hwp_mk/istep2/Makefile b/src/build/import_hwp_mk/istep2/Makefile
new file mode 100644
index 00000000..fd9317f0
--- /dev/null
+++ b/src/build/import_hwp_mk/istep2/Makefile
@@ -0,0 +1,57 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep2/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+# This Makefile compiles all of the hardware procedure code. See the
+# "*.mk" file in this directory.
+
+#all generated files from this makefile will end up in obj/*
+export SUB_OBJDIR = /istep2
+
+include img_defs.mk
+include istep2files.mk
+
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+
+GCC-CFLAGS += -mlongcall
+
+OBJSISTEP2 := $(addprefix $(OBJDIR-ISTEP2)/, $(ISTEP2_OBJECTS))
+
+#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all
+.PHONY: clean istep2
+
+libistep2.a: istep2
+	$(AR) crs $(OBJDIR-ISTEP2)/libistep2.a $(OBJDIR-ISTEP2)/*.o
+
+istep2: $(OBJSISTEP2)
+
+$(OBJSISTEP2) $(OBJSISTEP2:.o=.d): | $(OBJDIR-ISTEP2)
+
+$(OBJDIR-ISTEP2):
+	mkdir -p $(OBJDIR-ISTEP2)
+
+clean:
+	rm -fr $(OBJDIR-ISTEP2)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJSISTEP2:.o=.d)
+endif
diff --git a/src/build/import_hwp_mk/istep2/istep2files.mk b/src/build/import_hwp_mk/istep2/istep2files.mk
new file mode 100644
index 00000000..1d8113df
--- /dev/null
+++ b/src/build/import_hwp_mk/istep2/istep2files.mk
@@ -0,0 +1,50 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep2/istep2files.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+#  @file istep2files.mk
+#
+#  @brief mk for including istep2 object files
+#
+##########################################################################
+# Object Files
+##########################################################################
+
+ISTEP2-CPP-SOURCES = p9_sbe_attr_setup.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init1.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_gptr_time_initf.C
+ISTEP2-CPP-SOURCES +=p9_sbe_npll_initf.C
+ISTEP2-CPP-SOURCES +=p9_sbe_npll_setup.C
+ISTEP2-CPP-SOURCES +=p9_sbe_clock_test2.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_reset.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_repr_initf.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init2.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_arrayinit.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_initf.C
+ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init3.C
+ISTEP2-CPP-SOURCES +=p9_sbe_clock_test2.C
+ISTEP2-C-SOURCES =
+ISTEP2-S-SOURCES =
+
+ISTEP2_OBJECTS += $(ISTEP2-CPP-SOURCES:.C=.o)
+ISTEP2_OBJECTS += $(ISTEP2-C-SOURCES:.c=.o)
+ISTEP2_OBJECTS += $(ISTEP2-S-SOURCES:.S=.o)
diff --git a/src/build/import_hwp_mk/istep3/Makefile b/src/build/import_hwp_mk/istep3/Makefile
new file mode 100644
index 00000000..8ea239c7
--- /dev/null
+++ b/src/build/import_hwp_mk/istep3/Makefile
@@ -0,0 +1,57 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep3/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+# This Makefile compiles all of the hardware procedure code. See the
+# "*.mk" file in this directory.
+
+#all generated files from this makefile will end up in obj/*
+export SUB_OBJDIR = /istep3
+
+include img_defs.mk
+include istep3files.mk
+
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+
+GCC-CFLAGS += -mlongcall
+
+OBJSISTEP3 := $(addprefix $(OBJDIR-ISTEP3)/, $(ISTEP3_OBJECTS))
+
+#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all
+.PHONY: clean istep3
+
+libistep3.a: istep3
+	$(AR) crs $(OBJDIR-ISTEP3)/libistep3.a $(OBJDIR-ISTEP3)/*.o
+
+istep3: $(OBJSISTEP3)
+
+$(OBJSISTEP3) $(OBJSISTEP3:.o=.d): | $(OBJDIR-ISTEP3)
+
+$(OBJDIR-ISTEP3):
+	mkdir -p $(OBJDIR-ISTEP3)
+
+clean:
+	rm -fr $(OBJDIR-ISTEP3)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJSISTEP3:.o=.d)
+endif
diff --git a/src/build/import_hwp_mk/istep3/istep3files.mk b/src/build/import_hwp_mk/istep3/istep3files.mk
new file mode 100644
index 00000000..778b88a6
--- /dev/null
+++ b/src/build/import_hwp_mk/istep3/istep3files.mk
@@ -0,0 +1,57 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep3/istep3files.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+#  @file istep3files.mk
+#
+#  @brief mk for including istep3 object files
+#
+##########################################################################
+# Object Files
+##########################################################################
+
+ISTEP3-CPP-SOURCES = p9_sbe_chiplet_reset.C
+ISTEP3-CPP-SOURCES +=p9_sbe_gptr_time_initf.C
+ISTEP3-CPP-SOURCES +=p9_sbe_chiplet_pll_initf.C
+ISTEP3-CPP-SOURCES +=p9_sbe_chiplet_pll_setup.C
+ISTEP3-CPP-SOURCES +=p9_sbe_repr_initf.C
+ISTEP3-CPP-SOURCES +=p9_sbe_chiplet_init.C
+ISTEP3-CPP-SOURCES +=p9_sbe_arrayinit.C
+ISTEP3-CPP-SOURCES +=p9_sbe_tp_enable_ridi.C
+ISTEP3-CPP-SOURCES +=p9_sbe_setup_boot_freq.C
+ISTEP3-CPP-SOURCES +=p9_sbe_nest_initf.C
+ISTEP3-CPP-SOURCES +=p9_sbe_nest_startclocks.C
+ISTEP3-CPP-SOURCES +=p9_sbe_nest_enable_ridi.C
+ISTEP3-CPP-SOURCES +=p9_sbe_io_initf.C
+ISTEP3-CPP-SOURCES +=p9_sbe_startclock_chiplets.C
+ISTEP3-CPP-SOURCES +=p9_sbe_scominit.C
+ISTEP3-CPP-SOURCES +=p9_sbe_lpc_init.C
+ISTEP3-CPP-SOURCES +=p9_sbe_fabricinit.C
+ISTEP3-CPP-SOURCES +=p9_sbe_mcs_setup.C
+ISTEP3-CPP-SOURCES +=p9_sbe_setup_boot_freq.C
+ISTEP3-CPP-SOURCES +=p9_sbe_select_ex.C
+ISTEP3-C-SOURCES =
+ISTEP3-S-SOURCES =
+
+ISTEP3_OBJECTS += $(ISTEP3-CPP-SOURCES:.C=.o)
+ISTEP3_OBJECTS += $(ISTEP3-C-SOURCES:.c=.o)
+ISTEP3_OBJECTS += $(ISTEP3-S-SOURCES:.S=.o)
diff --git a/src/build/import_hwp_mk/istep4/Makefile b/src/build/import_hwp_mk/istep4/Makefile
new file mode 100644
index 00000000..4dc34fed
--- /dev/null
+++ b/src/build/import_hwp_mk/istep4/Makefile
@@ -0,0 +1,57 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep4/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+# This Makefile compiles all of the hardware procedure code. See the
+# "*.mk" file in this directory.
+
+#all generated files from this makefile will end up in obj/*
+export SUB_OBJDIR = /istep4
+
+include img_defs.mk
+include istep4files.mk
+
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+
+GCC-CFLAGS += -mlongcall
+
+OBJSISTEP4 := $(addprefix $(OBJDIR-ISTEP4)/, $(ISTEP4_OBJECTS))
+
+#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all
+.PHONY: clean istep4
+
+libistep4.a: istep4
+	$(AR) crs $(OBJDIR-ISTEP4)/libistep4.a $(OBJDIR-ISTEP4)/*.o
+
+istep4: $(OBJSISTEP4)
+
+$(OBJSISTEP4) $(OBJSISTEP4:.o=.d): | $(OBJDIR-ISTEP4)
+
+$(OBJDIR-ISTEP4):
+	mkdir -p $(OBJDIR-ISTEP4)
+
+clean:
+	rm -fr $(OBJDIR-ISTEP4)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJSISTEP4:.o=.d)
+endif
diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk
new file mode 100644
index 00000000..de347d56
--- /dev/null
+++ b/src/build/import_hwp_mk/istep4/istep4files.mk
@@ -0,0 +1,67 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep4/istep4files.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+#  @file istep4files.mk
+#
+#  @brief mk for including istep4 object files
+#
+##########################################################################
+# Object Files
+##########################################################################
+
+ISTEP4-CPP-SOURCES = p9_hcd_cache_poweron.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_chiplet_reset.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_gptr_time_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_dpll_setup.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_dcc_skewadjust_setup.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_chiplet_init.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_repair_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_arrayinit.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_startclocks.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_scominit.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_scomcust.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_dpll_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_chiplet_l3_dcc_setup.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_poweron.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_chiplet_reset.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_gptr_time_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_chiplet_init.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_repair_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_arrayinit.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_initf.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_startclocks.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_scominit.C
+ISTEP4-CPP-SOURCES +=p9_hcd_core_scomcust.C
+ISTEP4-CPP-SOURCES +=p9_core_scom.C
+ISTEP4-CPP-SOURCES +=p9_hcd_cache_dcc_skewadjust_setup.C
+ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
+ISTEP4-CPP-SOURCES +=p9_l2_scom.C
+ISTEP4-CPP-SOURCES +=p9_l3_scom.C
+ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
+ISTEP4-C-SOURCES =
+ISTEP4-S-SOURCES =
+
+ISTEP4_OBJECTS += $(ISTEP4-CPP-SOURCES:.C=.o)
+ISTEP4_OBJECTS += $(ISTEP4-C-SOURCES:.c=.o)
+ISTEP4_OBJECTS += $(ISTEP4-S-SOURCES:.S=.o)
diff --git a/src/build/import_hwp_mk/istep5/Makefile b/src/build/import_hwp_mk/istep5/Makefile
new file mode 100644
index 00000000..e4b8eb3f
--- /dev/null
+++ b/src/build/import_hwp_mk/istep5/Makefile
@@ -0,0 +1,55 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep5/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+# This Makefile compiles all of the hardware procedure code. See the
+# "*.mk" file in this directory.
+
+#all generated files from this makefile will end up in obj/*
+export SUB_OBJDIR = /istep5
+
+include img_defs.mk
+include istep5files.mk
+
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+
+OBJSISTEP5 := $(addprefix $(OBJDIR-ISTEP5)/, $(ISTEP5_OBJECTS))
+
+#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all
+.PHONY: clean istep5
+
+libistep5.a: istep5
+	$(AR) crs $(OBJDIR-ISTEP5)/libistep5.a $(OBJDIR-ISTEP5)/*.o
+
+istep5: $(OBJSISTEP5)
+
+$(OBJSISTEP5) $(OBJSISTEP5:.o=.d): | $(OBJDIR-ISTEP5)
+
+$(OBJDIR-ISTEP5):
+	mkdir -p $(OBJDIR-ISTEP5)
+
+clean:
+	rm -fr $(OBJDIR-ISTEP5)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJSISTEP5:.o=.d)
+endif
diff --git a/src/build/import_hwp_mk/istep5/istep5files.mk b/src/build/import_hwp_mk/istep5/istep5files.mk
new file mode 100644
index 00000000..3593ba20
--- /dev/null
+++ b/src/build/import_hwp_mk/istep5/istep5files.mk
@@ -0,0 +1,38 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istep5/istep5files.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+#  @file istep5files.mk
+#
+#  @brief mk for including istep5 object files
+#
+##########################################################################
+# Object Files
+##########################################################################
+
+ISTEP5-CPP-SOURCES = p9_sbe_instruct_start.C
+ISTEP5-C-SOURCES =
+ISTEP5-S-SOURCES =
+
+ISTEP5_OBJECTS += $(ISTEP5-CPP-SOURCES:.C=.o)
+ISTEP5_OBJECTS += $(ISTEP5-C-SOURCES:.c=.o)
+ISTEP5_OBJECTS += $(ISTEP5-S-SOURCES:.S=.o)
diff --git a/src/build/import_hwp_mk/istepcommon/Makefile b/src/build/import_hwp_mk/istepcommon/Makefile
new file mode 100644
index 00000000..645a3ce0
--- /dev/null
+++ b/src/build/import_hwp_mk/istepcommon/Makefile
@@ -0,0 +1,55 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istepcommon/Makefile $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+# This Makefile compiles all of the hardware procedure code. See the
+# "*.mk" file in this directory.
+
+#all generated files from this makefile will end up in obj/*
+export SUB_OBJDIR = /istepcommon
+
+include img_defs.mk
+include istepcommonfiles.mk
+
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
+
+OBJSISTEPCOMMON := $(addprefix $(OBJDIR-ISTEPCOMMON)/, $(ISTEPCOMMON_OBJECTS))
+
+#.PHONY: clean istep2 istep3 istep4 istep5 istepcommon all
+.PHONY: clean istepcommon
+
+libistepcommon.a: istepcommon
+	$(AR) crs $(OBJDIR-ISTEPCOMMON)/libistepcommon.a $(OBJDIR-ISTEPCOMMON)/*.o
+
+istepcommon: $(OBJSISTEPCOMMON)
+
+$(OBJSISTEPCOMMON) $(OBJSISTEPCOMMON:.o=.d): | $(OBJDIR-ISTEPCOMMON)
+
+$(OBJDIR-ISTEPCOMMON):
+	mkdir -p $(OBJDIR-ISTEPCOMMON)
+
+clean:
+	rm -fr $(OBJDIR-ISTEPCOMMON)
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(OBJSISTEPCOMMON:.o=.d)
+endif
diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
new file mode 100644
index 00000000..47505769
--- /dev/null
+++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
@@ -0,0 +1,59 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# 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
+#  @file istepCommonfiles.mk
+#
+#  @brief mk for including istepCommon object files
+#
+##########################################################################
+# Object Files
+##########################################################################
+ISTEPCOMMON-CPP-SOURCES +=p9_perv_sbe_cmn.C
+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_gear_switcher.C
+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_check_master_stop15.C
+ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
+ISTEPCOMMON-CPP-SOURCES +=p9_thread_control.C
+ISTEPCOMMON-CPP-SOURCES +=p9_common_pro_epi_log.C
+ISTEPCOMMON-CPP-SOURCES +=p9_fbc_utils.C
+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_load_bootloader.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pba_access.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pba_coherent_utils.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pba_setup.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_access.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_init.C
+ISTEPCOMMON-CPP-SOURCES +=p9_pm_utils.C
+ISTEPCOMMON-CPP-SOURCES +=p9_block_wakeup_intr.C
+ISTEPCOMMON-CPP-SOURCES +=p9_adu_setup.C
+ISTEPCOMMON-CPP-SOURCES +=p9_adu_coherent_utils.C
+ISTEPCOMMON-CPP-SOURCES +=p9_adu_access.C
+#Istep2 Procedure but this is required to run from PIBMEM
+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
+ISTEPCOMMON-C-SOURCES =
+ISTEPCOMMON-S-SOURCES =
+
+ISTEPCOMMON_OBJECTS += $(ISTEPCOMMON-CPP-SOURCES:.C=.o)
+ISTEPCOMMON_OBJECTS += $(ISTEPCOMMON-C-SOURCES:.c=.o)
+ISTEPCOMMON_OBJECTS += $(ISTEPCOMMON-S-SOURCES:.S=.o)
diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd
index fd1b1474..afcf1590 100644
--- a/src/build/linkerscripts/linkseeprom.cmd
+++ b/src/build/linkerscripts/linkseeprom.cmd
@@ -119,7 +119,7 @@ SECTIONS
 
     .text ALIGN(8): {
          _text_origin = .; _text_offset = . - _seeprom_origin;
-        *\libcore.a:(.text* ) *\libcache.a:(.text* ) *\libperv.a:(.text* )} > seeprom
+        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) } > seeprom
      _text_size = . - _text_origin;
 
     _seeprom_size = . - _seeprom_origin;