diff mbox

[v2,zesty,2/2] UBUNTU: [Config] CONFIG_SATA_HIGHBANK=y

Message ID 20170803211015.28839-3-seth.forshee@canonical.com
State New
Headers show

Commit Message

Seth Forshee Aug. 3, 2017, 9:10 p.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/1703430

This changed from y to m after trusty without justification.
Having it built as a module causes issues with booting on some
ARM systems.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian.master/abi/4.10.0-30.34/modules.ignore | 1 +
 debian.master/config/annotations              | 3 ++-
 debian.master/config/config.common.ubuntu     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 debian.master/abi/4.10.0-30.34/modules.ignore
diff mbox

Patch

diff --git a/debian.master/abi/4.10.0-30.34/modules.ignore b/debian.master/abi/4.10.0-30.34/modules.ignore
new file mode 100644
index 000000000000..c29ac6063d77
--- /dev/null
+++ b/debian.master/abi/4.10.0-30.34/modules.ignore
@@ -0,0 +1 @@ 
+sata_highbank
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2d3a99e849d..b1fb6fa079fe 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6102,7 +6102,7 @@  CONFIG_ATA_PIIX                                 policy<{'amd64': 'y', 'arm64': '
 CONFIG_SATA_DWC                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_DWC_OLD_DMA                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_SATA_DWC_DEBUG                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
-CONFIG_SATA_HIGHBANK                            policy<{'armhf': 'm'}>
+CONFIG_SATA_HIGHBANK                            policy<{'armhf': 'y'}>
 CONFIG_SATA_MV                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_NV                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_PROMISE                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
@@ -6156,6 +6156,7 @@  CONFIG_PATA_WINBOND                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_PATA_ACPI                                policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}>
 CONFIG_ATA_GENERIC                              policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'y', 'ppc64el': 'm'}>
 #
+CONFIG_SATA_HIGHBANK                            mark<ENFORCED> note<LP:1703430>
 CONFIG_PATA_HPT3X3_DMA                          note<DMA mode is documented problematic>
 CONFIG_ATA_PIIX					mark<ENFORCED> note<LP:1627324>
 
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 57780e030658..d48e018e039f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7075,7 +7075,7 @@  CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_SATA_DWC=m
 # CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_DWC_OLD_DMA=y
-CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m