summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/makefile2
-rw-r--r--src/usr/initservice/baseinitsvc/initsvctasks.H19
-rw-r--r--src/usr/initservice/extinitsvc/extinitsvctasks.H15
3 files changed, 19 insertions, 17 deletions
diff --git a/src/makefile b/src/makefile
index 3e71a7732..4534c8179 100644
--- a/src/makefile
+++ b/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
diff --git a/src/usr/initservice/baseinitsvc/initsvctasks.H b/src/usr/initservice/baseinitsvc/initsvctasks.H
index f99e41a6e..06301d3d6 100644
--- a/src/usr/initservice/baseinitsvc/initsvctasks.H
+++ b/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
*/
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index b3fc8adec..ea04481ff 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -85,21 +85,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,
*/
{
OpenPOWER on IntegriCloud