Remove all compile dependencies on old fapi

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

28 files changed, 121 insertions, 249 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index f056cc93c..f11a93f17 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -188,7 +188,8 @@ simics.tar_CONTENTS = \
     img/procmvpd_ven.dat \
     img/procmvpd_p9n.dat \
     img/cvpd.dat \
-    obj/genfiles/fapiAttrInfo.csv \
+#@TODO RTC:142088
+#   obj/genfiles/fapiAttrInfo.csv \
     obj/genfiles/fapiAttrEnumInfo.csv \
     obj/genfiles/targAttrInfo.csv
 
@@ -208,9 +209,6 @@ fsp.tar_CONTENTS = \
     img/simics_VENICE_targeting.bin \
     img/simics_NAPLES_targeting.bin \
     img/simics_NIMBUS_targeting.bin \
-    obj/genfiles/fapiAttrInfo.csv \
-    obj/genfiles/fapiAttrEnumInfo.csv \
-    obj/genfiles/targAttrInfo.csv \
     $(addsuffix :targeting/,\
 	$(call ROOTPATH_WILDCARD_RECURSIVE,src/usr/targeting/common))\
     $(addsuffix :targeting/,\
@@ -230,7 +228,6 @@ fsp.tar_CONTENTS = \
     src/include/usr/hwas/common/hwasCallout.H:hwas/ \
     src/include/usr/devicefw/driverif.H:devicefw/ \
     src/include/usr/devicefw/userif.H:devicefw/ \
-    obj/genfiles/plugins/fapiPlatHwpErrParser.H:plugins/ \
     obj/genfiles/plugins/errludattribute.H:plugins/ \
     obj/genfiles/plugins/errludtarget.H:plugins/ \
     $(addsuffix :plugins/,\
@@ -241,7 +238,12 @@ fsp.tar_CONTENTS = \
         $(call ROOTPATH_WILDCARD,src/usr/*/plugins/*)) \
     src/build/debug/fsp-memdump.sh:src/build/debug/ \
     obj/genfiles/hbfw_term_rc.H \
-    obj/genfiles/srcListing
+    obj/genfiles/srcListing \
+#@TODO RTC:142088
+#   obj/genfiles/fapiAttrInfo.csv \
+    obj/genfiles/fapiAttrEnumInfo.csv \
+    obj/genfiles/targAttrInfo.csv\
+    obj/genfiles/plugins/fapiPlatHwpErrParser.H:plugins/
 
 #
 # Portions of the FSP sandbox which must be rebuilt based on file changes.
diff --git a/src/build/tools/listdeps.pl b/src/build/tools/listdeps.pl
index efc7049b5..cb1a1fd44 100755
--- a/src/build/tools/listdeps.pl
+++ b/src/build/tools/listdeps.pl
@@ -194,6 +194,7 @@ my $resident_modules = {
     "libpnor.so"                => '1',
     "libmbox.so"                => '1',
     "libinitservice.so"         => '1',
+    "libisteps.so"              => '1',
     "libistepdisp.so"           => '1',
     "libextinitsvc.so"          => '1',
     "libplat.so"                => '1',
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index cc714fe16..779aa2a0c 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -342,7 +342,6 @@ namespace   INITSERVICE
 const DepModInfo g_istep08Dependancies = {
     {
         DEP_LIB(libistep08.so),
-        DEP_LIB(libsbe.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index 1d03f0c45..e133ad84c 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -248,8 +248,6 @@ namespace   INITSERVICE
 const DepModInfo  g_istep09Dependancies = {
     {
         DEP_LIB(libistep09.so),
-        DEP_LIB(libedi_ei_initialization.so),
-        DEP_LIB(libsbe.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
index a31f6bfd5..932367961 100644
--- a/src/include/usr/isteps/istep10list.H
+++ b/src/include/usr/isteps/istep10list.H
@@ -111,7 +111,6 @@ const   TaskInfo    g_istep10[]  =   {
 const DepModInfo g_istep10Dependancies = {
     {
         DEP_LIB(libistep10.so),
-        DEP_LIB(libsbe.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index e1c5db6e3..3effb1adf 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -144,7 +144,6 @@ namespace   INITSERVICE
 const DepModInfo g_istep16Dependancies = {
     {
         DEP_LIB(libistep16.so),
-        DEP_LIB(libbuild_winkle_images.so),
 #ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
         DEP_LIB(libocc.so),
 #endif
diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H
index 777f8c9fd..2220c3b6f 100644
--- a/src/include/usr/isteps/istep21list.H
+++ b/src/include/usr/isteps/istep21list.H
@@ -122,19 +122,7 @@ namespace   INITSERVICE
 const DepModInfo  g_istep21Dependancies = {
     {
         DEP_LIB(libistep21.so),
-#ifndef CONFIG_VPO_COMPILE
-        DEP_LIB(libbuild_winkle_images.so),
-        DEP_LIB(libstart_payload.so),
-        DEP_LIB(libruntime.so),
         DEP_LIB(libdevtree.so),
-#if defined(CONFIG_SET_NOMINAL_PSTATE) || defined(CONFIG_HTMGT)
-        DEP_LIB(libpstates.so),
-#endif
-        DEP_LIB(libocc.so),
-#if defined(CONFIG_HTMGT)
-        DEP_LIB(libhtmgt.so),
-#endif
-#endif
         NULL
     }
 };
diff --git a/src/makefile b/src/makefile
index 0a6adae35..846bdfd13 100644
--- a/src/makefile
+++ b/src/makefile
@@ -130,11 +130,8 @@ EXTENDED_MODULES += istep14
 EXTENDED_MODULES += istep15
 EXTENDED_MODULES += istep16
 EXTENDED_MODULES += istep21
+EXTENDED_MODULES += isteps
 EXTENDED_MODULES += targeting
-EXTENDED_MODULES += ecmddatabuffer
-EXTENDED_MODULES += fapi
-EXTENDED_MODULES += hwp
-EXTENDED_MODULES += plat
 EXTENDED_MODULES += extinitsvc
 EXTENDED_MODULES += istepdisp
 EXTENDED_MODULES += hwas
@@ -144,45 +141,22 @@ EXTENDED_MODULES += i2c
 EXTENDED_MODULES += intr
 EXTENDED_MODULES += scan
 EXTENDED_MODULES += vpd
-EXTENDED_MODULES += dmi_training
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,fapiporeve)
-EXTENDED_MODULES += poreve
 EXTENDED_MODULES += util
 EXTENDED_MODULES += tracedaemon
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,sbe_centaur_init)
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dram_training)
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,mdia)
 EXTENDED_MODULES += mbox
-EXTENDED_MODULES += prdf
-EXTENDED_MODULES += bus_training
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,activate_powerbus)
-EXTENDED_MODULES += build_winkle_images
-EXTENDED_MODULES += core_activate
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dram_initialization)
-EXTENDED_MODULES += edi_ei_initialization
-EXTENDED_MODULES += establish_system_smp
-EXTENDED_MODULES += occ
-EXTENDED_MODULES += nest_chiplets
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,start_payload)
-EXTENDED_MODULES += thread_activate
-EXTENDED_MODULES += slave_sbe
-EXTENDED_MODULES += attn
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,runtime)
+#@TODO RTC:126631
+#EXTENDED_MODULES += attn
 EXTENDED_MODULES += ibscom
 EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dump)
-EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,tod_init)
+EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,runtime)
 EXTENDED_MODULES += secureboot_ext
 EXTENDED_MODULES += $(if $(CONFIG_TPMDD),secureboot_trusted,)
 EXTENDED_MODULES += devtree
-EXTENDED_MODULES += sbe
-EXTENDED_MODULES += proc_hwreconfig
-EXTENDED_MODULES += pstates
 EXTENDED_MODULES += $(if $(CONFIG_HTMGT),htmgt)
 EXTENDED_MODULES += $(if $(CONFIG_GPIODD),gpio,)
 EXTENDED_MODULES += $(if $(CONFIG_CONSOLE),console)
 EXTENDED_MODULES += $(if $(CONFIG_CONSOLE_OUTPUT_ERRORDISPLAY),errldisplay)
 EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmi)
-EXTENDED_MODULES += secure_boot
 
 TESTCASE_MODULES += cxxtest
 TESTCASE_MODULES += testtrace
@@ -194,8 +168,6 @@ TESTCASE_MODULES += testxscom
 TESTCASE_MODULES += testtargeting
 TESTCASE_MODULES += testinitservice
 TESTCASE_MODULES += testkernel
-TESTCASE_MODULES += testhwpf
-TESTCASE_MODULES += testecmddatabuffer
 TESTCASE_MODULES += initsvctesttask
 TESTCASE_MODULES += testcxxtest
 TESTCASE_MODULES += testpnor
@@ -205,12 +177,13 @@ TESTCASE_MODULES += testvfs
 TESTCASE_MODULES += testhwas
 TESTCASE_MODULES += testintr
 TESTCASE_MODULES += testvpd
-TESTCASE_MODULES += testpore
 TESTCASE_MODULES += testutil
 TESTCASE_MODULES += testmbox
-TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia)
-TESTCASE_MODULES += testprdf
-TESTCASE_MODULES += testattn
+#TODO: Need to re-enable testmdia (RTC 135217)
+#TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia)
+#TESTCASE_MODULES += testprdf
+#TODO: Need to re-enable testattn (RTC 135217)
+#TESTCASE_MODULES += testattn
 TESTCASE_MODULES += testscan
 TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testruntime)
 TESTCASE_MODULES += testibscom
@@ -244,13 +217,6 @@ RUNTIME_MODULES += xscom_rt
 RUNTIME_MODULES += scom_rt
 RUNTIME_MODULES += vpd_rt
 RUNTIME_MODULES += i2c_rt
-RUNTIME_MODULES += ecmddatabuffer
-RUNTIME_MODULES += fapi_rt
-RUNTIME_MODULES += hwp_rt
-RUNTIME_MODULES += plat_rt
-RUNTIME_MODULES += build_winkle_images_rt
-RUNTIME_MODULES += occ_rt
-RUNTIME_MODULES += pstates
 RUNTIME_MODULES += $(if $(CONFIG_HTMGT),htmgt_rt)
 RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),bus_training_rt)
 RUNTIME_MODULES += $(if $(CONFIG_HBRT_PRD),attn_rt)
@@ -261,14 +227,12 @@ RUNTIME_MODULES += pnor_rt
 RUNTIME_DATA_MODULES +=
 RUNTIME_TESTCASE_MODULES += cxxtest_rt
 RUNTIME_TESTCASE_MODULES += testsyslib_rt
-RUNTIME_TESTCASE_MODULES += testtargeting_rt
 RUNTIME_TESTCASE_MODULES += testxscom_rt
 RUNTIME_TESTCASE_MODULES += testerrl_rt
 RUNTIME_TESTCASE_MODULES += testdevicefw_rt
 RUNTIME_TESTCASE_MODULES += testscom_rt
 RUNTIME_TESTCASE_MODULES += testutil_rt
 RUNTIME_TESTCASE_MODULES += testvpd_rt
-RUNTIME_TESTCASE_MODULES += testhwpf_rt
 RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_HBRT_PRD),testprdf_rt)
 RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_HBRT_PRD),testattn_rt)
 RUNTIME_TESTCASE_MODULES += $(if $(CONFIG_BMC_IPMI),testipmi_rt)
@@ -284,36 +248,10 @@ hbicore_EXTENDED_MODULES += ${EXTENDED_MODULES}
 # for PRDR_RULE_TABLE_TARGETS
 include ${ROOTPATH}/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk
 
-hbicore_DATA_MODULES += sample.if
-hbicore_DATA_MODULES += p8.dmi.scom.if
-hbicore_DATA_MODULES += cen.dmi.scom.if
-hbicore_DATA_MODULES += p8.fbc.scom.if
-hbicore_DATA_MODULES += mbs_def.if
-hbicore_DATA_MODULES += mba_def.if
-hbicore_DATA_MODULES += cen_ddrphy.if
-hbicore_DATA_MODULES += p8.pe.phase1.scom.if
-hbicore_DATA_MODULES += p8.pe.phase2.scom.if
-hbicore_DATA_MODULES += ${prd_rule_prf_targets}
-hbicore_DATA_MODULES += p8.abus.scom.if
-hbicore_DATA_MODULES += p8.xbus.scom.if
-hbicore_DATA_MODULES += p8.mcs.scom.if
-hbicore_DATA_MODULES += p8.as.scom.if
-hbicore_DATA_MODULES += p8.nx.scom.if
-hbicore_DATA_MODULES += p8.dmi.custom.scom.if
-hbicore_DATA_MODULES += cen.dmi.custom.scom.if
-hbicore_DATA_MODULES += p8.abus.custom.scom.if
-hbicore_DATA_MODULES += p8.xbus.custom.scom.if
-hbicore_DATA_MODULES += p8.psi.scom.if
-hbicore_DATA_MODULES += p8.tpbridge.scom.if
-hbicore_DATA_MODULES += p8.cxa.scom.if
-hbicore_DATA_MODULES += p8.a_x_pci_dmi_fir.scom.if
-hbicore_DATA_MODULES += p8.npu.scom.if
-
 hbicore_test_OBJECTS += ${hbicore_OBJECTS}
 hbicore_test_MODULES += ${hbicore_MODULES}
 hbicore_test_EXTENDED_MODULES += ${hbicore_EXTENDED_MODULES}
 hbicore_test_EXTENDED_MODULES += ${TESTCASE_MODULES}
-hbicore_test_DATA_MODULES += ${hbicore_DATA_MODULES}
 hbicore_test_DATA_MODULES += testdata
 ifndef SKIP_BINARY_FILES
 hbicore_test_DATA_MODULES += test_signed_container
diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C
index 5c06a666d..aca3f3562 100644
--- a/src/usr/devtree/bld_devtree.C
+++ b/src/usr/devtree/bld_devtree.C
@@ -49,8 +49,10 @@
 #include <i2c/i2cif.H>
 #include <i2c/eepromif.H>
 #include <ipmi/ipmisensor.H>
-#include <fapi.H>
-#include <fapiPlatHwpInvoker.H> // for fapi::fapiRcToErrl()
+
+//@TODO RTC:143092
+//#include <fapi.H>
+//#include <fapiPlatHwpInvoker.H> // for fapi::fapiRcToErrl()
 #include <vpd/mvpdenums.H>
 
 trace_desc_t *g_trac_devtree = NULL;
@@ -1944,6 +1946,9 @@ errlHndl_t bld_fdt_vpd(devTree * i_dt, bool i_smallTree)
             /***************************************************************/
             /* Add the #V bucket for each functional core                  */
             /***************************************************************/
+
+            //@TODO RTC:143092
+#if 0
             TARGETING::TargetHandleList l_exlist;
             fapi::Target l_pFapiProc(fapi::TARGET_TYPE_PROC_CHIP,
                             (const_cast<TARGETING::Target*>(l_pProc) ));
@@ -1988,6 +1993,7 @@ errlHndl_t bld_fdt_vpd(devTree * i_dt, bool i_smallTree)
             {
                 break;
             }
+#endif
         }
         if(errhdl)
         {
diff --git a/src/usr/hwas/test/hwas1test.H b/src/usr/hwas/test/hwas1test.H
index cb102e3f3..0d5822c8c 100644
--- a/src/usr/hwas/test/hwas1test.H
+++ b/src/usr/hwas/test/hwas1test.H
@@ -41,10 +41,6 @@
 
 // CXXTEST
 #include <cxxtest/TestSuite.H>
-#include <hwpf/plat/fapiPlatAttributeService.H>
-#include <fapiReturnCode.H>
-#include <fapiAttributeIds.H>
-#include <fapiAttributeService.H>
 #include <errl/errlmanager.H>
 
 #include <hwas/common/hwas.H>
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index 959f19b68..964649179 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -240,89 +240,8 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 EXT_IMAGE,                                  // Extended Module
             }
         },
-        /**
-         * @brief   ecmddatabuffer task,
-         */
-        {
-                "libecmddatabuffer.so" ,                    // taskname
-                NULL,                                       // no pointer to fn
-                {
-                        INIT_TASK,                          // task type
-                        EXT_IMAGE,                          // Extended Module
-                }
-        },
-
-        /**
-         * @brief   fapi task,
-         */
-        {
-                "libfapi.so" ,                              // taskname
-                NULL,                                       // no pointer to fn
-                {
-                        INIT_TASK,                          // task type
-                        EXT_IMAGE,                          // Extended Module
-                }
-        },
-
-        /**
-         * @brief   hwp task,
-         */
-        {
-                "libhwp.so" ,                               // taskname
-                NULL,                                       // no pointer to fn
-                {
-                        INIT_TASK,                          // task type
-                        EXT_IMAGE,                          // Extended Module
-                }
-        },
-
-        /**
-         * @brief   plat task,
-         */
-        {
-                "libplat.so" ,                              // taskname
-                NULL,                                       // no pointer to fn
-                {
-                        START_TASK,                         // task type
-                        EXT_IMAGE,                          // Extended Module
-                }
-        },
-
         // @todo RTC:137627 - remove for p9 bringup
 #if (0)
-        /**
-         * @brief   Start slave threads
-         */
-        {
-            "libthread_activate.so" ,               // taskname
-            NULL,                                   // no pointer to fn
-            {
-                START_TASK,                         // task type
-                EXT_IMAGE,                          // Extended Module
-            }
-        },
-        {
-            "libthread_activate.so" ,               // taskname
-            NULL,                                   // no pointer to fn
-            {
-                UNINIT_TASK,                        // task type
-                EXT_IMAGE,                          // Extended Module
-            }
-        },
-#endif
-
-        /**
-         * @brief  bus_training library.
-         */
-        {
-            "libbus_training.so",                  // library name
-            NULL,                                  // no function to run
-            {
-                INIT_TASK,                         // init only
-                EXT_IMAGE,                         // extended image module
-            }
-        },
-
 // No mdia in VPO
 #ifndef CONFIG_VPO_COMPILE
         /**
@@ -362,6 +281,7 @@ const TaskInfo g_exttaskinfolist[]   =   {
             }
         },
 
+#endif
 #ifdef CONFIG_GPIODD
         /**
          * @brief GPIO code library
@@ -390,7 +310,19 @@ const TaskInfo g_exttaskinfolist[]   =   {
         },
 #endif
 
-
+        /**
+         * @brief   Common istep functions
+         *
+         *
+         */
+        {
+            "libisteps.so" ,                                // taskname
+            NULL,                                           // no pointer to fn
+            {
+                INIT_TASK,                                 // task type
+                EXT_IMAGE,                                  // Extended Module
+            }
+        },
 
         //  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         // NOTE: libistepdisp.so needs to always be last in this list!!
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 79fadae42..0fd9d5f94 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -48,7 +48,8 @@
 #include <targeting/common/targetservice.H>
 #include <targeting/attrsync.H>
 #include <establish_system_smp.H>
-#include <hwpf/plat/fapiPlatAttributeService.H>
+//@TODO RTC:128106 port to fapi2 plat attribute service
+//#include <hwpf/plat/fapiPlatAttributeService.H>
 #include <mbox/mbox_queues.H>            // HB_ISTEP_MSGQ
 #include <mbox/mboxif.H>                 // register mailbox
 #include <intr/interrupt.H>
@@ -275,7 +276,8 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl)
 
                 if (l_attrOverridesExist)
                 {
-                    fapi::theAttrOverrideSync().getAttrOverridesFromFsp();
+                    //@TODO RTC:128106 port to fapi2 plat attribute service
+                    //fapi::theAttrOverrideSync().getAttrOverridesFromFsp();
                 }
 
                 // Start a new thread to handle non-IStep messages from the FSP
@@ -342,7 +344,8 @@ void IStepDispatcher::init(errlHndl_t &io_rtaskRetErrl)
             // Attributes to sync to the FSP
             if(iv_spBaseServicesEnabled)
             {
-                fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp();
+                //@TODO RTC:128106 port to fapi2 plat attribute service
+                //fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp();
             }
         }
     } while(0);
@@ -1574,7 +1577,8 @@ void IStepDispatcher::handleIStepRequestMsg(msg_t * & io_pMsg)
 
     // Send the potentially modified set of Attribute overrides and any
     // Attributes to sync (to Cronus) to the FSP
-    fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp();
+    //@TODO RTC:128106 port to fapi2 plat attribute service
+    //fapi::theAttrOverrideSync().sendAttrOverridesAndSyncsToFsp();
 
     // Transfer ownership of the message pointer back from iv_pIstepMsg
     mutex_lock(&iv_mutex);
@@ -1676,8 +1680,10 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg)
 
         // Create child thread so that if there are problems, the istep
         //  dispatcher code continues
-        tid_t l_progTid = task_create(
-                ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg);
+        //  @TODO RTC:133831
+        //tid_t l_progTid = task_create(
+        //        ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg);
+        tid_t l_progTid = 1;
         assert( l_progTid > 0 );
         //  wait here for the task to end.
         //  status of the task ( OK or Crashed ) is returned in l_childsts
@@ -1733,7 +1739,8 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg)
             }
 
             // Re-enable p8_cpu_special_wakeup
-            err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup();
+            // @TODO RTC:133831
+            //err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup();
             if (err)
             {
                 TRACFCOMP( g_trac_initsvc,
@@ -2011,7 +2018,8 @@ errlHndl_t  IStepDispatcher::handleCoalesceHostMsg()
     }
     else
     {
-        err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host();
+        //@TODO RTC:133831
+        //err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host();
         if (err)
         {
             TRACFCOMP(g_trac_initsvc, "handleCoalesceHostMsg: Error with "
diff --git a/src/usr/isteps/istep08/call_host_slave_sbe_config.C b/src/usr/isteps/istep08/call_host_slave_sbe_config.C
index ee4ba9480..322038448 100644
--- a/src/usr/isteps/istep08/call_host_slave_sbe_config.C
+++ b/src/usr/isteps/istep08/call_host_slave_sbe_config.C
@@ -187,6 +187,8 @@ void* call_host_slave_sbe_config(void *io_pArgs)
     }
 
     // Resolve the side characteristics of the Processor SBE Seeproms
+#if 0
+    //@TODO RTC:142091
     errlHndl_t err = SBE::resolveProcessorSbeSeeproms();
     if ( err )
     {
@@ -196,8 +198,7 @@ void* call_host_slave_sbe_config(void *io_pArgs)
         // Commit Error
         errlCommit( err, HWPF_COMP_ID );
     }
-
-
+#endif
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                "call_host_slave_sbe_config exit" );
 
diff --git a/src/usr/isteps/istep09/call_host_startprd_pbus.C b/src/usr/isteps/istep09/call_host_startprd_pbus.C
index a3d0b6b18..c4e6d13a8 100644
--- a/src/usr/isteps/istep09/call_host_startprd_pbus.C
+++ b/src/usr/isteps/istep09/call_host_startprd_pbus.C
@@ -6,6 +6,7 @@
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -87,7 +88,8 @@ void*    call_host_startprd_pbus( void    *io_pArgs )
 
     do
     {
-        l_errl = PRDF::initialize();
+        //@TODO RTC:134079
+        //l_errl = PRDF::initialize();
         if (l_errl)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/isteps/istep10/call_host_slave_sbe_update.C b/src/usr/isteps/istep10/call_host_slave_sbe_update.C
index 4a82043cc..1d466a820 100644
--- a/src/usr/isteps/istep10/call_host_slave_sbe_update.C
+++ b/src/usr/isteps/istep10/call_host_slave_sbe_update.C
@@ -6,6 +6,7 @@
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -69,7 +70,8 @@ void* call_host_slave_sbe_update (void *io_pArgs)
 
         // Call to check state of Processor SBE SEEPROMs and
         // make any necessary updates
-        l_errl = SBE::updateProcessorSbeSeeproms();
+        // @TODO RTC:142091 add it after SBE is ported to fapi2
+        //l_errl = SBE::updateProcessorSbeSeeproms();
 
         if (l_errl)
         {
diff --git a/src/usr/makefile b/src/usr/makefile
index 1f7362c1e..0e5f18806 100644
--- a/src/usr/makefile
+++ b/src/usr/makefile
@@ -40,8 +40,6 @@ SUBDIRS += scom.d
 SUBDIRS += xscom.d
 SUBDIRS += targeting.d
 SUBDIRS += initservice.d
-SUBDIRS += hwpf.d
-SUBDIRS += ecmddatabuffer.d
 SUBDIRS += pnor.d
 SUBDIRS += i2c.d
 SUBDIRS += vfs.d
@@ -49,10 +47,8 @@ SUBDIRS += fsi.d
 SUBDIRS += hwas.d
 SUBDIRS += fsiscom.d
 SUBDIRS += intr.d
-SUBDIRS += pore.d
 SUBDIRS += util.d
 SUBDIRS += mbox.d
-SUBDIRS += diag.d
 SUBDIRS += vpd.d
 SUBDIRS += scan.d
 SUBDIRS += runtime.d
@@ -60,12 +56,13 @@ SUBDIRS += ibscom.d
 SUBDIRS += dump.d
 SUBDIRS += secureboot.d
 SUBDIRS += devtree.d
-SUBDIRS += sbe.d
+#@TODO RTC:142091
+#SUBDIRS += sbe.d
 SUBDIRS += gpio.d
 SUBDIRS += lpc.d
 SUBDIRS += console.d
 SUBDIRS += errldisplay.d
 SUBDIRS += ipmi.d
-SUBDIRS += htmgt.d
+#SUBDIRS += htmgt.d
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/mbox/ipcSp.C b/src/usr/mbox/ipcSp.C
index 6f86f7962..f2f3cd26e 100644
--- a/src/usr/mbox/ipcSp.C
+++ b/src/usr/mbox/ipcSp.C
@@ -112,10 +112,11 @@ void IpcSp::msgHandler()
                 }
                 if(!err)
                 {
-                    RUNTIME::setPayloadBaseAddress
-                        (reinterpret_cast<uint64_t>(msg->extra_data));
+                    //@TODO RTC:132750
+                    //RUNTIME::setPayloadBaseAddress
+                    //    (reinterpret_cast<uint64_t>(msg->extra_data));
 
-                    err = RUNTIME::populate_node_attributes( msg->data[0] );
+                    //err = RUNTIME::populate_node_attributes( msg->data[0] );
                 }
 
                 if (err)
diff --git a/src/usr/runtime/hdatservice.C b/src/usr/runtime/hdatservice.C
index 0084a54fe..4f3a94fb7 100644
--- a/src/usr/runtime/hdatservice.C
+++ b/src/usr/runtime/hdatservice.C
@@ -41,7 +41,8 @@
 
 //#define REAL_HDAT_TEST
 
-extern trace_desc_t* g_trac_runtime;
+trace_desc_t *g_trac_runtime = NULL;
+TRAC_INIT(&g_trac_runtime, RUNTIME_COMP_NAME, KILOBYTE);
 
 #define TRACUCOMP TRACDCOMP
 
diff --git a/src/usr/runtime/makefile b/src/usr/runtime/makefile
index d1ab8bc1b..e8ecca91c 100644
--- a/src/usr/runtime/makefile
+++ b/src/usr/runtime/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
+# [+] 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.
@@ -30,8 +32,8 @@
 ROOTPATH = ../../..
 MODULE = runtime
 
-
-OBJS += populate_attributes.o
+#@TODO RTC:132750
+#OBJS += populate_attributes.o
 OBJS += hdatservice.o
 OBJS += fakepayload.o
 OBJS += tce.o
@@ -39,10 +41,4 @@ OBJS += errlud_hdat.o
 
 SUBDIRS += test.d
 
-##      support for fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
-
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/runtime/test/makefile b/src/usr/runtime/test/makefile
index 5833f8092..a0a1c5c5c 100644
--- a/src/usr/runtime/test/makefile
+++ b/src/usr/runtime/test/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
+# [+] 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.
@@ -23,13 +25,12 @@
 ROOTPATH = ../../../..
 
 MODULE = testruntime
-TESTS = *.H
+TESTS += hdatservicetest.H
+TESTS += tcetest.H
+
+#@TODO RTC:132750
+#TESTS += runtimeattrtest.H
 
-# support for fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/runtime/
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/scom/runtime/handleSpecialWakeup.C b/src/usr/scom/runtime/handleSpecialWakeup.C
index e62721d5b..0a97b41dd 100644
--- a/src/usr/scom/runtime/handleSpecialWakeup.C
+++ b/src/usr/scom/runtime/handleSpecialWakeup.C
@@ -1,11 +1,12 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/scom/disableSW.C $                                    */
+/* $Source: src/usr/scom/runtime/handleSpecialWakeup.C $                  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -33,9 +34,6 @@
 #include <targeting/common/utilFilter.H>
 #include <targeting/common/util.H>
 
-#include <fapi.H>
-#include <fapiPlatHwpInvoker.H>
-#include "p8_cpu_special_wakeup.H"
 
 extern "C"
 {
@@ -51,6 +49,8 @@ errlHndl_t handleSpecialWakeup(TARGETING::Target* i_exTarget,
 {
     errlHndl_t l_errl = NULL;
 
+    //@TODO RTC:132413 Add it back once we have fapi2 support
+#if 0
     fapi::Target l_fapi_ex_target(TARGET_TYPE_EX_CHIPLET,
                             (const_cast<TARGETING::Target*>(i_exTarget)) );
 
@@ -84,6 +84,7 @@ errlHndl_t handleSpecialWakeup(TARGETING::Target* i_exTarget,
         // capture the target data in the elog
         ERRORLOG::ErrlUserDetailsTarget(i_exTarget).addToLog( l_errl );
     }
+#endif
 
     return l_errl;
 }
diff --git a/src/usr/targeting/attrPlatOverride.C b/src/usr/targeting/attrPlatOverride.C
index 9368c4af1..2b11fbd5e 100644
--- a/src/usr/targeting/attrPlatOverride.C
+++ b/src/usr/targeting/attrPlatOverride.C
@@ -23,7 +23,8 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 #include <targeting/attrPlatOverride.H>
-#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
+//@TODO RTC:128106
+//#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
 #include <targeting/common/trace.H>
 #include <targeting/common/targreasoncodes.H>
 #include <errl/errlmanager.H>
@@ -37,9 +38,9 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
     TRACFCOMP(g_trac_targeting,"attrPlatOverride::getAttrOverrides ENTER");
 
     // Create local permanent override tank and array of tanks
+    errlHndl_t l_err = NULL;
     AttributeTank l_PermTank;
     AttributeTank* l_overTanks[AttributeTank::TANK_LAYER_LAST];
-    errlHndl_t l_err = NULL;
 
     // Local pointer to array containing each tank layer or io_tanks
     AttributeTank* *l_pOverTanks;
@@ -49,8 +50,9 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
     if (io_tanks == NULL)
     {
         // All indexes are -1 due to the first enum being TANK_LAYER_NONE,
-        l_overTanks[AttributeTank::TANK_LAYER_FAPI-1] =
-                    &fapi::theAttrOverrideSync().iv_overrideTank;
+        //@TODO RTC:128106
+        //l_overTanks[AttributeTank::TANK_LAYER_FAPI-1] =
+        //            &fapi::theAttrOverrideSync().iv_overrideTank;
         l_overTanks[AttributeTank::TANK_LAYER_TARG-1] =
                     &Target::theTargOverrideAttrTank();
         l_overTanks[AttributeTank::TANK_LAYER_PERM-1] = &l_PermTank;
diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H
index 6bb22857c..1a61da3ea 100644
--- a/src/usr/targeting/common/test/testcommontargeting.H
+++ b/src/usr/targeting/common/test/testcommontargeting.H
@@ -41,10 +41,6 @@
 #include <sys/time.h>
 
 // CXXTEST
-#include <hwpf/plat/fapiPlatAttributeService.H>
-#include <fapiReturnCode.H>
-#include <fapiAttributeIds.H>
-#include <fapiAttributeService.H>
 #include <targeting/common/error.H>
 
 // This component
@@ -1298,7 +1294,6 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using direct access macros");
 
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetService& l_targetService = targetService();
 
@@ -1345,6 +1340,9 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using FAPI get macros");
 
         memset(l_dummyRw,0x00,sizeof(l_dummyRw));
+
+#if 0
+        //@TODO RTC:142602
         fapi::ReturnCode l_rc = FAPI_ATTR_GET(
                                               ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8, NULL, l_dummyRw);
         if(l_rc != 0)
@@ -1361,6 +1359,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using FAPI set macros");
 
         l_dummyRw[0][2][3] = 6;
+
         l_rc = FAPI_ATTR_SET(ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8, NULL,
                              l_dummyRw);
         if(l_rc != 0)
@@ -1392,7 +1391,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             TARG_TS_FAIL("Node 0 target handle should not be NULL");
         }
-
+        //@TODO RTC:142602
         fapi::Target* l_pFapiTarget = new fapi::Target(
                                                        fapi::TARGET_TYPE_PROC_CHIP, l_pTarget);
         l_rc = FAPI_ATTR_GET(ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8,
@@ -1406,13 +1405,13 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             TARG_TS_FAIL("Should have been a platform handled error");
         }
-
         // The error log will get deleted when the ReturnCode is destructed. The
         // error log is not committed here to avoid it getting interpreted as a
         // real problem
 
         delete l_pFapiTarget;
         l_pFapiTarget = NULL;
+#endif
 
         TARG_TS_TRACE(EXIT_MRK "testFapiToHbMacros" );
     }
@@ -1422,7 +1421,6 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(ENTER_MRK "testPodNumericalTypes" );
 
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetService& l_targetService = targetService();
 
diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
index eaa6dbb8d..5330b963c 100644
--- a/src/usr/targeting/makefile
+++ b/src/usr/targeting/makefile
@@ -65,7 +65,8 @@ OBJS += ${HOSTBOOT_SPECIFIC_OBJS}
 SUBDIRS += test.d
 SUBDIRS += xmltohb.d
 SUBDIRS += runtime.d
-SUBDIRS += attroverride.d
+#@TODO RTC:128106
+#SUBDIRS += attroverride.d
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C
index 98d063fa0..9a5498111 100644
--- a/src/usr/targeting/runtime/attrPlatOverride_rt.C
+++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/targeting/attrPlatOverride.C $                        */
+/* $Source: src/usr/targeting/runtime/attrPlatOverride_rt.C $             */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -27,7 +27,8 @@
 #include <runtime/rt_targeting.H>
 #include <targeting/common/commontargeting.H>
 #include <targeting/attrPlatOverride.H>
-#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
+//@TODO RTC:132750
+//#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
 #include <targeting/common/trace.H>
 #include <errl/errlmanager.H>
 
@@ -40,6 +41,8 @@ int apply_attr_override(uint8_t* i_data,
                         size_t i_size )
 {
     int rc = 0;
+//@TODO RTC:132750
+#if 0
     errlHndl_t l_errl = NULL;
 
     TRACFCOMP(g_trac_targeting, "enter apply_attr_override");
@@ -83,6 +86,7 @@ int apply_attr_override(uint8_t* i_data,
     {
         TRACFCOMP(g_trac_targeting, "apply_attr_override succeed");
     }
+#endif
     return rc;
 }
 
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index 1c78cbd98..4dd9806d0 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -26,7 +26,8 @@ HOSTBOOT_RUNTIME = 1
 ROOTPATH = ../../../..
 MODULE = targeting_rt
 
-SUBDIRS += test.d
+#@TODO RTC:132750
+#SUBDIRS += test.d
 
 TARGETING_REL_PATH = ..
 include ${TARGETING_REL_PATH}/hostboot_common.mk
diff --git a/src/usr/targeting/test/makefile b/src/usr/targeting/test/makefile
index ae56feb31..b8d466539 100644
--- a/src/usr/targeting/test/makefile
+++ b/src/usr/targeting/test/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2011,2014
+# Contributors Listed Below - COPYRIGHT 2011,2015
+# [+] 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.
diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H
index 695836496..fdd4702da 100644
--- a/src/usr/targeting/test/testtargeting.H
+++ b/src/usr/targeting/test/testtargeting.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] 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.       */
@@ -40,10 +42,7 @@
 
 // CXXTEST
 #include <cxxtest/TestSuite.H>
-#include <hwpf/plat/fapiPlatAttributeService.H>
-#include <fapiReturnCode.H>
-#include <fapiAttributeIds.H>
-#include <fapiAttributeService.H>
+
 #include <errl/errlmanager.H>
 #include <sys/sync.h>
 #include <sys/task.h>
@@ -103,7 +102,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
         TS_TRACE(ENTER_MRK "testHbMutexAttr" );
 
         using namespace TARGETING;
-        using namespace fapi;
 
         do {
 
@@ -207,7 +205,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
 
         using namespace ERRORLOG;
         using namespace TARGETING;
-        using namespace fapi;
 
         // Get a reference to the target service
         TargetService& l_service = targetService();
@@ -253,7 +250,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
         // is resolved
         using namespace ERRORLOG;
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetHandleList l_targs;