Stripped down P9 isteps to what is needed for functionality

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

12 files changed, 2 insertions, 445 deletions

diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 2070a2f56..6c1fade4f 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -102,55 +102,10 @@ const   TaskInfo    g_istep06[]  =   {
                         BASE_INITIALIZATION }
         },
         {
-                ISTEPNAME(06,04,"host_set_ipl_parms"),
-                HWAS::host_set_ipl_parms,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
-        },
-        {
                 ISTEPNAME(06,05,"host_discover_targets"),
                 HWAS::host_discover_targets,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
-        {
-                ISTEPNAME(06,06, "host_gard"),
-                HWAS::host_gard,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,07,"host_cancontinue_clear"),
-                HWAS::host_cancontinue_clear,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,08,"proc_revert_sbe_mcs_setup"),
-                SLAVE_SBE::call_proc_revert_sbe_mcs_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,09,"host_slave_sbe_config"),
-                SLAVE_SBE::call_host_slave_sbe_config,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,10,"host_sbe_start"),
-                SLAVE_SBE::call_host_sbe_start,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,11,"proc_check_slave_sbe_seeprom_complete"),
-                SLAVE_SBE::call_proc_check_slave_sbe_seeprom_complete,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,12,"proc_cen_ref_clk_enable"),
-                SLAVE_SBE::call_proc_cen_ref_clk_enable,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(06,13,"proc_xmit_sbe"),
-                SLAVE_SBE::call_proc_xmit_sbe,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
 };
 
 const DepModInfo  g_istep06Dependancies = {
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index 46cefeaa8..0563a036e 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.H
@@ -69,52 +69,6 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-        {
-                ISTEPNAME(07,01,"proc_attr_update"),
-                NEST_CHIPLETS::call_proc_attr_update,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,02,"proc_a_x_pci_dmi_pll_initf"),
-                NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_initf,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,03,"proc_a_x_pci_dmi_pll_setup"),
-                NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-
-        {
-                ISTEPNAME(07,04,"proc_startclock_chiplets"),
-                NEST_CHIPLETS::call_proc_startclock_chiplets,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,05,"proc_chiplet_scominit"),
-                NEST_CHIPLETS::call_proc_chiplet_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,06,"proc_xbus_scominit"),
-                NEST_CHIPLETS::call_proc_xbus_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,07,"proc_abus_scominit"),
-                NEST_CHIPLETS::call_proc_abus_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,08,"proc_pcie_scominit"),
-                NEST_CHIPLETS::call_proc_pcie_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(07,09,"proc_scomoverride_chiplets"),
-                NEST_CHIPLETS::call_proc_scomoverride_chiplets,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
 };
 
 
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index d949ccdb7..7434b2abf 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -71,46 +71,6 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-        {
-                ISTEPNAME(08,01,"fabric_erepair"),
-                EDI_EI_INITIALIZATION::call_fabric_erepair,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,02,"fabric_io_dccal"),
-                EDI_EI_INITIALIZATION::call_fabric_io_dccal,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,03,"fabric_pre_trainadv"),
-                EDI_EI_INITIALIZATION::call_fabric_pre_trainadv,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,04,"fabric_io_run_training"),
-                EDI_EI_INITIALIZATION::call_fabric_io_run_training,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,05,"fabric_post_trainadv"),
-                EDI_EI_INITIALIZATION::call_fabric_post_trainadv,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,06,"host_startprd_pbus"),
-                EDI_EI_INITIALIZATION::call_host_startprd_pbus,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,07,"host_attnlisten_proc"),
-                EDI_EI_INITIALIZATION::call_host_attnlisten_proc,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(08,08,"proc_fab_iovalid"),
-                EDI_EI_INITIALIZATION::call_proc_fab_iovalid,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
 };
 
 const DepModInfo g_istep08Dependancies = {
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index 6ea16a920..4ff5b9c2c 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -61,19 +61,6 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-// Reduce ext img for VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(09,01,"proc_build_smp"),
-                ACTIVATE_POWERBUS::call_proc_build_smp,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(09,02,"host_slave_sbe_update"),
-                ACTIVATE_POWERBUS::call_host_slave_sbe_update,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-#endif
 };
 
 const DepModInfo  g_istep09Dependancies = {
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
index e47139915..50f3efcf1 100644
--- a/src/include/usr/isteps/istep10list.H
+++ b/src/include/usr/isteps/istep10list.H
@@ -82,82 +82,6 @@ const   TaskInfo    g_istep10[]  =   {
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// Reduce extended img size for VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(10,01,"host_prd_hwreconfig"),
-                HWAS::host_prd_hwreconfig,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true,
-                        MEMORY_INIT }
-        },
-        {
-                ISTEPNAME(10,02,"cen_sbe_tp_chiplet_init1"),
-                SBE_CENTAUR_INIT::call_sbe_centaur_init,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,03,"cen_sbe_pll_initf"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,04,"cen_sbe_pll_setup"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,05,"cen_sbe_tp_chiplet_init2"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,06,"cen_sbe_tp_arrayinit"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,07,"cen_sbe_tp_chiplet_init3"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,08,"cen_sbe_chiplet_init"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,09,"cen_sbe_arrayinit"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,10,"cen_sbe_dts_init"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,11,"cen_sbe_initf"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,12,"cen_sbe_do_manual_inits"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,13,"cen_sbe_nest_startclocks"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(10,14,"cen_sbe_scominits"),
-                HWAS::host_stub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-#endif
-
 };
 
 const DepModInfo g_istep10Dependancies = {
diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H
index 2b4895323..b92df8018 100644
--- a/src/include/usr/isteps/istep11list.H
+++ b/src/include/usr/isteps/istep11list.H
@@ -82,75 +82,6 @@ const   TaskInfo    g_istep11[]  =   {
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// Reduce extended image size for VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(11,01,"mss_getecid"),
-                DMI_TRAINING::call_mss_getecid,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,02,"dmi_attr_update"),
-                DMI_TRAINING::call_dmi_attr_update,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,03,"proc_dmi_scominit"),
-                DMI_TRAINING::call_proc_dmi_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,04,"dmi_scominit"),
-                DMI_TRAINING::call_dmi_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,05,"dmi_erepair"),
-                DMI_TRAINING::call_dmi_erepair,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,06,"dmi_io_dccal"),
-                DMI_TRAINING::call_dmi_io_dccal,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,07,"dmi_pre_trainadv"),
-                DMI_TRAINING::call_dmi_pre_trainadv,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,08,"dmi_io_run_training"),
-                DMI_TRAINING::call_dmi_io_run_training,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,09,"dmi_post_trainadv"),
-                DMI_TRAINING::call_dmi_post_trainadv,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,10,"proc_cen_framelock"),
-                DMI_TRAINING::call_proc_cen_framelock,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,11,"host_startprd_dmi"),
-                DMI_TRAINING::call_host_startprd_dmi,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,12,"host_attnlisten_cen"),
-                DMI_TRAINING::call_host_attnlisten_cen,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(11,13,"cen_set_inband_addr"),
-                DMI_TRAINING::call_cen_set_inband_addr,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-#endif
 };
 
 const DepModInfo g_istep11Dependancies = {
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index f66873381..9d2c213f4 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -91,12 +91,8 @@ const   TaskInfo    g_istep12[]  =   {
                 MC_CONFIG::call_mss_eff_config,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-        {
-                ISTEPNAME(12,05,"mss_attr_update"),
-                MC_CONFIG::call_mss_attr_update,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
 #endif
+
 };
 
 const DepModInfo g_istep12Dependancies = {
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 4c5c57983..73ea3483b 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -81,70 +81,6 @@ const   TaskInfo    g_istep13[]  =   {
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// Reduce extended image size for VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(13,01,"host_disable_vddr"),
-                DRAM_TRAINING::call_host_disable_vddr,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,02,"mem_pll_initf"),
-                DRAM_TRAINING::call_mem_pll_initf,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,03,"mem_pll_setup"),
-                DRAM_TRAINING::call_mem_pll_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,04,"mem_startclocks"),
-                DRAM_TRAINING::call_mem_startclocks,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,05,"host_enable_vddr"),
-                DRAM_TRAINING::call_host_enable_vddr,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,06,"mss_scominit"),
-                DRAM_TRAINING::call_mss_scominit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,07,"mss_ddr_phy_reset"),
-                DRAM_TRAINING::call_mss_ddr_phy_reset,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,08,"mss_draminit"),
-                DRAM_TRAINING::call_mss_draminit,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,09,"mss_draminit_training"),
-                DRAM_TRAINING::call_mss_draminit_training,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,10,"mss_draminit_trainadv"),
-                DRAM_TRAINING::call_mss_draminit_trainadv,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,11,"mss_draminit_mc"),
-                DRAM_TRAINING::call_mss_draminit_mc,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(13,12,"mss_dimm_power_test"),
-                DRAM_TRAINING::call_mss_dimm_power_test,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-#endif
 };
 
 const DepModInfo g_istep13Dependancies = {
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index 010836077..db0acb600 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -75,50 +75,10 @@ namespace   INITSERVICE
 // Reduce ext img for VPO
 #ifndef CONFIG_VPO_COMPILE
         {
-                ISTEPNAME(14,01,"host_startprd_dram"),
-                DRAM_INITIALIZATION::call_host_startprd_dram,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,02,"mss_extent_setup"),
-                DRAM_INITIALIZATION::call_mss_extent_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,03,"mss_memdiag"),
-                DRAM_INITIALIZATION::call_mss_memdiag,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,04,"mss_thermal_init"),
-                DRAM_INITIALIZATION::call_mss_thermal_init,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,05,"proc_pcie_config"),
-                DRAM_INITIALIZATION::call_proc_pcie_config,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,06,"mss_power_cleanup"),
-                DRAM_INITIALIZATION::call_mss_power_cleanup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
-        },
-        {
                 ISTEPNAME(14,07,"proc_setup_bars"),
                 DRAM_INITIALIZATION::call_proc_setup_bars,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
-        {
-                ISTEPNAME(14,08,"proc_exit_cache_contained"),
-                DRAM_INITIALIZATION::call_proc_exit_cache_contained,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
-        },
-        {
-                ISTEPNAME(14,09,"host_mpipl_service"),
-                DRAM_INITIALIZATION::call_host_mpipl_service,
-                { START_FN, EXT_IMAGE, MPIPL_OP, true }
-        },
 #endif
     };
 
diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H
index b982e2a64..659e57620 100644
--- a/src/include/usr/isteps/istep15list.H
+++ b/src/include/usr/isteps/istep15list.H
@@ -68,16 +68,6 @@ namespace   INITSERVICE
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true,
                         SEC_PROCESSOR_INIT }
         },
-        {
-                ISTEPNAME(15,02,"proc_set_pore_bar"),
-                BUILD_WINKLE_IMAGES::call_proc_set_pore_bar,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
-        },
-        {
-                ISTEPNAME(15,03,"p8_poreslw_init"),
-                BUILD_WINKLE_IMAGES::call_p8_poreslw_init,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
-        },
 #endif        
 
 };
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index dffb279b4..9fab5aa6c 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -69,21 +69,6 @@ namespace   INITSERVICE
                 CORE_ACTIVATE::call_host_activate_master,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
         },
-        {
-                ISTEPNAME(16,02,"host_activate_slave_cores"),
-                CORE_ACTIVATE::call_host_activate_slave_cores,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
-        },
-        {
-                ISTEPNAME(16,03,"mss_scrub"),
-                CORE_ACTIVATE::call_mss_scrub,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-        {
-                ISTEPNAME(16,04,"host_ipl_complete"),
-                CORE_ACTIVATE::call_host_ipl_complete,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
-        },
 };
 
 const DepModInfo g_istep16Dependancies = {
diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H
index cd6745102..b96fcd36f 100644
--- a/src/include/usr/isteps/istep18list.H
+++ b/src/include/usr/isteps/istep18list.H
@@ -102,11 +102,6 @@ namespace   INITSERVICE
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
         {
-                ISTEPNAME(18,09,"sys_proc_fab_iovalid"),
-                NULL,
-                { NONE, EXT_IMAGE, IPL_NOOP, false }
-        },
-        {
                 ISTEPNAME(18,10,""),
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
@@ -121,22 +116,6 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-
-// To reduce extended image size for VPO, don't run these isteps in VPO
-#ifndef CONFIG_VPO_COMPILE
-        {
-                ISTEPNAME(18,13,"proc_tod_setup"),
-                TOD::call_tod_setup,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false,
-                        STARTING_OS }
-        },
-        {
-                ISTEPNAME(18,14,"proc_tod_init"),
-                TOD::call_tod_init,
-                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
-        },
-#endif
-
 };
 
 const DepModInfo g_istep18Dependancies = {