6 files changed, 14 insertions, 16 deletions
diff --git a/src/build/import_hwp_mk/istep2/istep2files.mk b/src/build/import_hwp_mk/istep2/istep2files.mk
index ad20cb10..b1fa9c02 100644
--- a/src/build/import_hwp_mk/istep2/istep2files.mk
+++ b/src/build/import_hwp_mk/istep2/istep2files.mk
@@ -41,13 +41,6 @@ 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
-# TODO via RTC 170704
-# These procedures also needed in PIBMEM. Just having a quick fix
-# for lab
-ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_access.C
-ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
-ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
-ISTEP2-CPP-SOURCES +=p9_pm_ocb_init.C
 ISTEP2-C-SOURCES =
 ISTEP2-S-SOURCES =
 
diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk
index 5fa151e0..e4d0a424 100644
--- a/src/build/import_hwp_mk/istep4/istep4files.mk
+++ b/src/build/import_hwp_mk/istep4/istep4files.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -60,6 +60,7 @@ 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-CPP-SOURCES +=p9_sbe_check_master_stop15.C
 ISTEP4-C-SOURCES =
 ISTEP4-S-SOURCES =
 
diff --git a/src/build/import_hwp_mk/istep5/istep5files.mk b/src/build/import_hwp_mk/istep5/istep5files.mk
index 3593ba20..6c993355 100644
--- a/src/build/import_hwp_mk/istep5/istep5files.mk
+++ b/src/build/import_hwp_mk/istep5/istep5files.mk
@@ -5,7 +5,8 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +31,8 @@
 ##########################################################################
 
 ISTEP5-CPP-SOURCES = p9_sbe_instruct_start.C
+ISTEP5-CPP-SOURCES +=p9_thread_control.C
+ISTEP5-CPP-SOURCES +=p9_sbe_load_bootloader.C
 ISTEP5-C-SOURCES =
 ISTEP5-S-SOURCES =
 
diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
index adfa05fe..8833c75e 100644
--- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
+++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
@@ -29,20 +29,21 @@
 ##########################################################################
 # Object Files
 ##########################################################################
-ISTEPCOMMON-CPP-SOURCES +=p9_perv_sbe_cmn.C
 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
+ISTEPCOMMON-CPP-SOURCES +=p9_perv_sbe_cmn.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_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_adu_setup.C
 ISTEPCOMMON-CPP-SOURCES +=p9_adu_coherent_utils.C
 ISTEPCOMMON-CPP-SOURCES +=p9_adu_access.C
+ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
 #Istep2 Procedure but this is required to run from PIBMEM
 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_npll_setup.C
diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd
index feabaccb..cabb2c1e 100644
--- a/src/build/linkerscripts/linkseeprom.cmd
+++ b/src/build/linkerscripts/linkseeprom.cmd
@@ -98,7 +98,7 @@ SECTIONS
     ////////////////////////////////
     .text ALIGN(8): {
          _text_origin = .; _text_offset = . - _seeprom_origin;
-        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) } > seeprom
+        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) } > seeprom
      _text_size = . - _text_origin;
 
    ////////////////////////////////
diff --git a/src/sbefw/Makefile b/src/sbefw/Makefile
index 56c4fce5..89d16d37 100644
--- a/src/sbefw/Makefile
+++ b/src/sbefw/Makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016
+# Contributors Listed Below - COPYRIGHT 2016,2017
 # [+] International Business Machines Corp.
 #
 #