ipmi: Split into ipmibase and ipmiext modules

Split the IPMI module into base and ext portions, with the BT interface,
device driver and resource provider in the base portion, and all
remaining IPMI functionality in the ext portion. The split is in
preparation for moving the base functionality in the hostboot base
image.

Change-Id: Iec864f96240d79f4fadd5519d2ef46437d07c1fd
Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66792
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

33 files changed, 95 insertions, 62 deletions

diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index 04798d791..757a10478 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -179,11 +179,11 @@ const TaskInfo g_exttaskinfolist[]   =   {
         },
 
         /**
-         * @brief IPMI resource provider
+         * @brief IPMI
          */
 #ifdef CONFIG_BMC_IPMI
         {
-            "libipmi.so",                               // taskname
+            "libipmibase.so",                           // taskname
             NULL,                                       // no ptr to fnct
             {
 
@@ -191,6 +191,15 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 EXT_IMAGE,                              // Extended Module
             }
         },
+        {
+            "libipmiext.so",                            // taskname
+            NULL,                                       // no ptr to fnct
+            {
+
+                INIT_TASK,                              // task type
+                EXT_IMAGE,                              // Extended Module
+            }
+        },
 #endif
 
         /**
diff --git a/src/usr/ipmi/HBconfig b/src/usr/ipmibase/HBconfig
index f0c4281f9..0980a3eb2 100644
--- a/src/usr/ipmi/HBconfig
+++ b/src/usr/ipmibase/HBconfig
@@ -8,9 +8,3 @@ config BMC_BT_LPC_IPMI
     depends on BMC_IPMI
     help
         Determines if the BMC uses the LPC bus for block-transfer IPMI traffic
-
-config BMC_IPMI_LONG_WATCHDOG
-    default y if CONSOLE_OUTPUT_TRACE || CONSOLE_TRACE_LITE
-    depends on BMC_IPMI
-    help
-        Sets watchdog default timer to several times normal for debugging
diff --git a/src/usr/ipmi/ipmibt.C b/src/usr/ipmibase/ipmibt.C
index 818813d79..1f99a3384 100644
--- a/src/usr/ipmi/ipmibt.C
+++ b/src/usr/ipmibase/ipmibt.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmibt.C $                                       */
+/* $Source: src/usr/ipmibase/ipmibt.C $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmibt.H b/src/usr/ipmibase/ipmibt.H
index 0a757707a..5fae5dc5e 100644
--- a/src/usr/ipmi/ipmibt.H
+++ b/src/usr/ipmibase/ipmibt.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmibt.H $                                       */
+/* $Source: src/usr/ipmibase/ipmibt.H $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmiconfig.C b/src/usr/ipmibase/ipmiconfig.C
index cdfb1167b..269ae00b2 100644
--- a/src/usr/ipmi/ipmiconfig.C
+++ b/src/usr/ipmibase/ipmiconfig.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmiconfig.C $                                   */
+/* $Source: src/usr/ipmibase/ipmiconfig.C $                               */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmiconfig.H b/src/usr/ipmibase/ipmiconfig.H
index 673be6128..07e027f21 100644
--- a/src/usr/ipmi/ipmiconfig.H
+++ b/src/usr/ipmibase/ipmiconfig.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmiconfig.H $                                   */
+/* $Source: src/usr/ipmibase/ipmiconfig.H $                               */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmidd.C b/src/usr/ipmibase/ipmidd.C
index 3462c1a8a..0e155a808 100644
--- a/src/usr/ipmi/ipmidd.C
+++ b/src/usr/ipmibase/ipmidd.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmidd.C $                                       */
+/* $Source: src/usr/ipmibase/ipmidd.C $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmidd.H b/src/usr/ipmibase/ipmidd.H
index a9b8ada8c..9e95f466e 100644
--- a/src/usr/ipmi/ipmidd.H
+++ b/src/usr/ipmibase/ipmidd.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmidd.H $                                       */
+/* $Source: src/usr/ipmibase/ipmidd.H $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmimsg.C b/src/usr/ipmibase/ipmimsg.C
index 4d00d1922..d86b68229 100644
--- a/src/usr/ipmi/ipmimsg.C
+++ b/src/usr/ipmibase/ipmimsg.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmimsg.C $                                      */
+/* $Source: src/usr/ipmibase/ipmimsg.C $                                  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmimsg.H b/src/usr/ipmibase/ipmimsg.H
index b7f6d966e..e91e01869 100644
--- a/src/usr/ipmi/ipmimsg.H
+++ b/src/usr/ipmibase/ipmimsg.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmimsg.H $                                      */
+/* $Source: src/usr/ipmibase/ipmimsg.H $                                  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmirp.C b/src/usr/ipmibase/ipmirp.C
index 8afff0136..c8272274c 100644
--- a/src/usr/ipmi/ipmirp.C
+++ b/src/usr/ipmibase/ipmirp.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmirp.C $                                       */
+/* $Source: src/usr/ipmibase/ipmirp.C $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmirp.H b/src/usr/ipmibase/ipmirp.H
index 0f9b02302..ddf846afb 100644
--- a/src/usr/ipmi/ipmirp.H
+++ b/src/usr/ipmibase/ipmirp.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmirp.H $                                       */
+/* $Source: src/usr/ipmibase/ipmirp.H $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmiselrecord.C b/src/usr/ipmibase/ipmiselrecord.C
index 5d82d4fe3..7fc74b967 100644
--- a/src/usr/ipmi/ipmiselrecord.C
+++ b/src/usr/ipmibase/ipmiselrecord.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmiselrecord.C $                                */
+/* $Source: src/usr/ipmibase/ipmiselrecord.C $                            */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmibase/makefile b/src/usr/ipmibase/makefile
new file mode 100644
index 000000000..e08057254
--- /dev/null
+++ b/src/usr/ipmibase/makefile
@@ -0,0 +1,34 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/ipmibase/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2011,2018
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../..
+MODULE = ipmibase
+
+OBJS += ipmimsg.o
+OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmibt.o)
+OBJS += ipmirp.o
+OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmidd.o)
+OBJS += ipmiconfig.o
+OBJS += ipmiselrecord.o
+
+include ${ROOTPATH}/config.mk
diff --git a/src/usr/ipmiext/HBconfig b/src/usr/ipmiext/HBconfig
new file mode 100644
index 000000000..218d65fb5
--- /dev/null
+++ b/src/usr/ipmiext/HBconfig
@@ -0,0 +1,5 @@
+config BMC_IPMI_LONG_WATCHDOG
+    default y if CONSOLE_OUTPUT_TRACE || CONSOLE_TRACE_LITE
+    depends on BMC_IPMI
+    help
+        Sets watchdog default timer to several times normal for debugging
diff --git a/src/usr/ipmi/ipmi.mk b/src/usr/ipmiext/ipmi.mk
index 9e4459543..25930f96c 100644
--- a/src/usr/ipmi/ipmi.mk
+++ b/src/usr/ipmiext/ipmi.mk
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/ipmi/ipmi.mk $
+# $Source: src/usr/ipmiext/ipmi.mk $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
diff --git a/src/usr/ipmi/ipmichassiscontrol.C b/src/usr/ipmiext/ipmichassiscontrol.C
index ff4161e25..30ce7fccc 100644
--- a/src/usr/ipmi/ipmichassiscontrol.C
+++ b/src/usr/ipmiext/ipmichassiscontrol.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmichassiscontrol.C $                           */
+/* $Source: src/usr/ipmiext/ipmichassiscontrol.C $                        */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmiconfiglookup.C b/src/usr/ipmiext/ipmiconfiglookup.C
index ee2eb85eb..e2e234661 100644
--- a/src/usr/ipmi/ipmiconfiglookup.C
+++ b/src/usr/ipmiext/ipmiconfiglookup.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmiconfiglookup.C $                             */
+/* $Source: src/usr/ipmiext/ipmiconfiglookup.C $                          */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2017                             */
+/* Contributors Listed Below - COPYRIGHT 2017,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmidcmi.C b/src/usr/ipmiext/ipmidcmi.C
index e3708fdf0..24f192d29 100644
--- a/src/usr/ipmi/ipmidcmi.C
+++ b/src/usr/ipmiext/ipmidcmi.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmidcmi.C $                                     */
+/* $Source: src/usr/ipmiext/ipmidcmi.C $                                  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmifru.C b/src/usr/ipmiext/ipmifru.C
index 66bb8d9ae..4d6d19340 100644
--- a/src/usr/ipmi/ipmifru.C
+++ b/src/usr/ipmiext/ipmifru.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmifru.C $                                      */
+/* $Source: src/usr/ipmiext/ipmifru.C $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmifru.H b/src/usr/ipmiext/ipmifru.H
index a8cb4916b..c107e3a11 100644
--- a/src/usr/ipmi/ipmifru.H
+++ b/src/usr/ipmiext/ipmifru.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmifru.H $                                      */
+/* $Source: src/usr/ipmiext/ipmifru.H $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmifruinv.C b/src/usr/ipmiext/ipmifruinv.C
index 175507d45..8e49ed7ba 100644
--- a/src/usr/ipmi/ipmifruinv.C
+++ b/src/usr/ipmiext/ipmifruinv.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmifruinv.C $                                   */
+/* $Source: src/usr/ipmiext/ipmifruinv.C $                                */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmifruinvprvt.H b/src/usr/ipmiext/ipmifruinvprvt.H
index b7f0bf982..772a650f8 100644
--- a/src/usr/ipmi/ipmifruinvprvt.H
+++ b/src/usr/ipmiext/ipmifruinvprvt.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmifruinvprvt.H $                               */
+/* $Source: src/usr/ipmiext/ipmifruinvprvt.H $                            */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmipowerstate.C b/src/usr/ipmiext/ipmipowerstate.C
index 95d661a6e..b76200d26 100644
--- a/src/usr/ipmi/ipmipowerstate.C
+++ b/src/usr/ipmiext/ipmipowerstate.C
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmipowerstate.C $                               */
+/* $Source: src/usr/ipmiext/ipmipowerstate.C $                            */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmisel.C b/src/usr/ipmiext/ipmisel.C
index 6b7618fd9..369c5b79f 100644
--- a/src/usr/ipmi/ipmisel.C
+++ b/src/usr/ipmiext/ipmisel.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmisel.C $                                      */
+/* $Source: src/usr/ipmiext/ipmisel.C $                                   */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmiext/ipmisensor.C
index 173f6e546..5dd428d06 100644
--- a/src/usr/ipmi/ipmisensor.C
+++ b/src/usr/ipmiext/ipmisensor.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmisensor.C $                                   */
+/* $Source: src/usr/ipmiext/ipmisensor.C $                                */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -59,7 +59,6 @@ namespace SENSOR
         iv_msg = new setSensorReadingRequest;
     };
 
-    // base class destructor
     SensorBase::~SensorBase()
     {
         // The memory allocated for the set sensor reading command is deleted
diff --git a/src/usr/ipmi/ipmiwatchdog.C b/src/usr/ipmiext/ipmiwatchdog.C
index 42da2a5ba..5f7b9bde0 100644
--- a/src/usr/ipmi/ipmiwatchdog.C
+++ b/src/usr/ipmiext/ipmiwatchdog.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/ipmiwatchdog.C $                                 */
+/* $Source: src/usr/ipmiext/ipmiwatchdog.C $                              */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/usr/ipmi/makefile b/src/usr/ipmiext/makefile
index 50638b522..e9aa66deb 100644
--- a/src/usr/ipmi/makefile
+++ b/src/usr/ipmiext/makefile
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/ipmi/makefile $
+# $Source: src/usr/ipmiext/makefile $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2016
+# Contributors Listed Below - COPYRIGHT 2011,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -23,24 +23,17 @@
 #
 # IBM_PROLOG_END_TAG
 ROOTPATH = ../../..
-MODULE = ipmi
+MODULE = ipmiext
 
 #include common ojects between hostboot and runtime hostboot
 include ipmi.mk
 
-OBJS += ipmimsg.o
-OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmibt.o)
-OBJS += ipmirp.o
-OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmidd.o)
 OBJS += ipmifru.o
-OBJS += ipmiconfig.o
 OBJS += ipmiwatchdog.o
 OBJS += ipmifruinv.o
 OBJS += ipmipowerstate.o
-OBJS += ipmiselrecord.o
 OBJS += ipmichassiscontrol.o
 
 SUBDIRS += runtime.d
-#SUBDIRS += test.d
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/ipmi/runtime/makefile b/src/usr/ipmiext/runtime/makefile
index 6f49d9ef1..e044f35de 100644
--- a/src/usr/ipmi/runtime/makefile
+++ b/src/usr/ipmiext/runtime/makefile
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/ipmi/runtime/makefile $
+# $Source: src/usr/ipmiext/runtime/makefile $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
diff --git a/src/usr/ipmi/runtime/rt_ipmirp.C b/src/usr/ipmiext/runtime/rt_ipmirp.C
index 07d099f84..496b3f782 100644
--- a/src/usr/ipmi/runtime/rt_ipmirp.C
+++ b/src/usr/ipmiext/runtime/rt_ipmirp.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/runtime/rt_ipmirp.C $                            */
+/* $Source: src/usr/ipmiext/runtime/rt_ipmirp.C $                         */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -27,8 +27,6 @@
  * @brief IPMI resource provider definition for runtime
  */
 
-#include "../ipmirp.H"
-#include "../ipmidd.H"
 #include <ipmi/ipmi_reasoncodes.H>
 #include <ipmi/ipmiif.H>
 
diff --git a/src/usr/ipmi/runtime/test/makefile b/src/usr/ipmiext/runtime/test/makefile
index a12933112..6967a77c6 100644
--- a/src/usr/ipmi/runtime/test/makefile
+++ b/src/usr/ipmiext/runtime/test/makefile
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/ipmi/runtime/test/makefile $
+# $Source: src/usr/ipmiext/runtime/test/makefile $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
diff --git a/src/usr/ipmi/runtime/test/rt_ipmitest.H b/src/usr/ipmiext/runtime/test/rt_ipmitest.H
index b3a252e31..5ee93eca5 100644
--- a/src/usr/ipmi/runtime/test/rt_ipmitest.H
+++ b/src/usr/ipmiext/runtime/test/rt_ipmitest.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/ipmi/runtime/test/rt_ipmitest.H $                     */
+/* $Source: src/usr/ipmiext/runtime/test/rt_ipmitest.H $                  */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/usr/makefile b/src/usr/makefile
index af52ef1d1..ca4f9d512 100644
--- a/src/usr/makefile
+++ b/src/usr/makefile
@@ -63,7 +63,8 @@ SUBDIRS += gpio.d
 SUBDIRS += lpc.d
 SUBDIRS += console.d
 SUBDIRS += errldisplay.d
-SUBDIRS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmi.d)
+SUBDIRS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmibase.d)
+SUBDIRS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmiext.d)
 SUBDIRS += $(if $(CONFIG_HTMGT),htmgt.d)
 SUBDIRS += diag.d
 SUBDIRS += xz.d