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

Submitted by Seth Forshee on Aug. 3, 2017, 9:10 p.m.

Details

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

Commit Message

Seth Forshee Aug. 3, 2017, 9:10 p.m.
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.4.0-89.112/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.4.0-89.112/modules.ignore

Patch hide | download patch | download mbox

diff --git a/debian.master/abi/4.4.0-89.112/modules.ignore b/debian.master/abi/4.4.0-89.112/modules.ignore
new file mode 100644
index 000000000000..c29ac6063d77
--- /dev/null
+++ b/debian.master/abi/4.4.0-89.112/modules.ignore
@@ -0,0 +1 @@ 
+sata_highbank
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 86cc26deb932..2b1bff6543d3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5502,7 +5502,7 @@  CONFIG_PATA_LEGACY                              policy<{'amd64': 'm', 'arm64': '
 # Menu: Device Drivers >> Serial ATA and Parallel ATA drivers (libata) >> ATA SFF support (for legacy IDE and PATA) >> ATA BMDMA support
 CONFIG_ATA_BMDMA                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_ATA_PIIX                                 policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'y', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_SATA_HIGHBANK                            policy<{'armhf': 'm'}>
+CONFIG_SATA_HIGHBANK                            policy<{'armhf': 'y'}>
 CONFIG_SATA_MV                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_NV                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_SATA_PROMISE                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
@@ -5557,6 +5557,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', 'powerpc': 'm', 'ppc64el': 'm'}>
 #
+CONFIG_SATA_HIGHBANK                            mark<ENFORCED> note<LP:1703430>
 CONFIG_PATA_HPT3X3_DMA                          note<DMA mode is documented problematic>
 
 # Menu: Device Drivers >> Sonics Silicon Backplane
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1c7ce82ec07e..a012224b9188 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6548,7 +6548,7 @@  CONFIG_SAMSUNG_Q10=m
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_FSL=m
-CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m