[PATCH 1/1][artful SRU] UBUNTU: [Config] CONFIG_SPI_INTEL_SPI_PLATFORM=n

[Seth Forshee]

BugLink: http://bugs.launchpad.net/bugs/1734147

Some Lenovo users are ending up with corrupted bios, and
guidance from Intel is that (for now at least) this option should
be disabled. Seems the driver was never really meant for end
users anyway.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian.master/abi/4.13.0-19.22/modules.ignore | 2 ++
 debian.master/config/annotations              | 4 +++-
 debian.master/config/config.common.ubuntu     | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 debian.master/abi/4.13.0-19.22/modules.ignore

diff --git a/debian.master/abi/4.13.0-19.22/modules.ignore b/debian.master/abi/4.13.0-19.22/modules.ignore
new file mode 100644
index 000000000000..6c4faefdfc5b
--- /dev/null
+++ b/debian.master/abi/4.13.0-19.22/modules.ignore
@@ -0,0 +1,2 @@
+intel-spi
+intel-spi-platform
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b4656baf9d28..617d6b9ed5c7 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -3650,7 +3650,9 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS               policy<{'amd64': 'y', 'arm64': '
 CONFIG_SPI_CADENCE_QUADSPI                      policy<{'armhf': 'm'}>
 CONFIG_SPI_FSL_QUADSPI                          policy<{'arm64': 'm', 'armhf-generic': 'm'}>
 CONFIG_SPI_HISI_SFC                             policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_SPI_INTEL_SPI_PLATFORM                   policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_SPI_INTEL_SPI_PLATFORM                   policy<{'amd64': 'n', 'i386': 'n'}>
+#
+CONFIG_SPI_INTEL_SPI_PLATFORM                   mark<ENFORCE> note<LP:1734147>
 
 # Menu: Device Drivers >> Memory Technology Device (MTD) support >> Self-contained MTD device drivers
 CONFIG_MTD_PMC551                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 243a2e2fbb60..37a14874f7f9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8583,8 +8583,7 @@ CONFIG_SPI_FSL_SPI=y
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_HISI_SFC=m
 CONFIG_SPI_IMX=m
-CONFIG_SPI_INTEL_SPI=m
-CONFIG_SPI_INTEL_SPI_PLATFORM=m
+# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_MASTER=y
-- 
2.14.1