initservice: Move ipmibase module to base image

Moving ipmibase to the base image enables the development of a new,
IPMI-based PNOR implementation. This new PNOR driver will negotiate the
layout of the LPC FW space using an AST MBOX-like protocol, now known as
the hiomap protocol, but using IPMI as a transport.

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

src/makefile

@@ -145,6 +145,7 @@ BASE_MODULES += xscom
 BASE_MODULES += initservice
 BASE_MODULES += secureboot_base
 BASE_MODULES += lpc
+BASE_MODULES += $(if $(CONFIG_BMC_IPMI),ipmibase)
 BASE_MODULES += pnor
 BASE_MODULES += vfs
 BASE_MODULES += $(if $(CONFIG_AST2400) || $(CONFIG_AST2500), sio)
@@ -195,7 +196,6 @@ 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),ipmibase)
 EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmiext)
 EXTENDED_MODULES += xz
 EXTENDED_MODULES += p9_stop_util

src/usr/initservice/baseinitsvc/initsvctasks.H

@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2014              */
+/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
+/* [+] 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.       */
@@ -53,6 +55,21 @@ const TaskInfo    g_taskinfolist[]   =   {
                 }
         },
 
+#ifdef CONFIG_BMC_IPMI
+        /**
+         * @brief IPMI resource provider
+         */
+        {
+            "libipmibase.so",                           // taskname
+            NULL,                                       // no ptr to fnct
+            {
+
+                START_TASK,                             // task type
+                BASE_IMAGE,                             // Base Module
+            }
+        },
+#endif
+
         /**
          * @brief   PNOR    Driver  Task
          */

src/usr/initservice/extinitsvc/extinitsvctasks.H

@@ -84,21 +84,6 @@ const TaskInfo g_exttaskinfolist[]   =   {
         },
 #endif
 
-        /**
-         * @brief IPMI resource provider
-         */
-#ifdef CONFIG_BMC_IPMI
-        {
-            "libipmibase.so",                           // taskname
-            NULL,                                       // no ptr to fnct
-            {
-
-                START_TASK,                             // task type
-                EXT_IMAGE,                              // Extended Module
-            }
-        },
-#endif
-
         /**
          * @brief   targeting task,
          */