[Trusty] UBUNTU: [Config] Revert back to build IPMI as a module on all arches

[Stefan Bader]

>From dda7970cbbe45a884bee9b49d910f41346c6fa70 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader at canonical.com>
Date: Mon, 24 Feb 2014 11:07:14 +0100
Subject: [PATCH] UBUNTU: [Config] Revert back to build IPMI as a module on
 all arches

The upstream discussion[1] went on and there seem to be issues with
this being built in on x86 as well. One is the default probing on
certain ports by default which already caused issues on Arm. The
other is that the driver can use some CPU cycles for message handling
even when nobody listens to it.
Upstream is trying to address this with some additional changes[2]. But
for Trusty it seems the better option to revert back to what we had
before. If this turns out to be needed in future, we still can backport
things once they are settled. Though it looks like at least the change
of default probing could require manual intervention for serveral other
boards.

[1] https://lkml.org/lkml/2014/2/18/383
[2] https://lkml.org/lkml/2014/2/23/221

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 -
 debian.master/config/arm64/config.common.arm64     |    1 -
 debian.master/config/armhf/config.common.armhf     |    1 -
 debian.master/config/config.common.ubuntu          |    3 ++-
 debian.master/config/i386/config.common.i386       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 -
 debian.master/config/ppc64el/config.common.ppc64el |    1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4290b3d..203853b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -133,7 +133,6 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IPACK_BUS=m
-CONFIG_IPMI_SI=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ISDN=y
 CONFIG_ISO9660_FS=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 4860e98..3fb2ec7 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -92,7 +92,6 @@ CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INTERVAL_TREE_TEST=m
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IPACK_BUS=m
-CONFIG_IPMI_SI=m
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ISDN=y
 CONFIG_ISO9660_FS=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index e08bbd3..cc874ee 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -116,7 +116,6 @@ CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IPACK_BUS=m
-CONFIG_IPMI_SI=m
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ISDN=y
 CONFIG_ISO9660_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8dc8f08..10ca89d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -54,7 +54,7 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
-CONFIG_ACPI_IPMI=y
+CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_PROCESSOR=y
@@ -3001,6 +3001,7 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_HANDLER=y
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWEROFF=m
+CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPPP_FILTER=y
 CONFIG_IPV6=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 2290831..4713eff 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -131,7 +131,6 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IPACK_BUS=m
-CONFIG_IPMI_SI=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_ISA=y
 CONFIG_ISDN=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index f5749d4..df56e80 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -136,7 +136,6 @@ CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INTERVAL_TREE_TEST=m
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IPACK_BUS=m
-CONFIG_IPMI_SI=m
 # CONFIG_IRQ_ALL_CPUS is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_ISA is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index ce7ba3f..6508296 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -147,7 +147,6 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IPACK_BUS is not set
-CONFIG_IPMI_SI=m
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_IRQ_DOMAIN_DEBUG=y
 # CONFIG_ISDN is not set
-- 
1.7.9.5