From patchwork Tue Oct 15 11:45:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 283593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 786DC2C00C8 for ; Tue, 15 Oct 2013 22:46:16 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VW34k-0004ru-0P; Tue, 15 Oct 2013 11:46:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VW34W-0004pn-Ja for kernel-team@lists.ubuntu.com; Tue, 15 Oct 2013 11:45:56 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VW34W-0003Vh-Ek for kernel-team@lists.ubuntu.com; Tue, 15 Oct 2013 11:45:56 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] AHCI_IMX=y Date: Tue, 15 Oct 2013 13:45:53 +0200 Message-Id: <1381837553-32749-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1381837553-32749-1-git-send-email-paolo.pisati@canonical.com> References: <1381837553-32749-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Paolo Pisati --- debian.master/abi/3.11.0-12.19/armhf/generic.modules | 2 -- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/armhf/config.flavour.generic | 2 ++ debian.master/config/armhf/config.flavour.generic-lpae | 2 ++ debian.master/config/config.common.ubuntu | 2 -- debian.master/config/i386/config.common.i386 | 2 ++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian.master/abi/3.11.0-12.19/armhf/generic.modules b/debian.master/abi/3.11.0-12.19/armhf/generic.modules index d38a439..b4fa172 100644 --- a/debian.master/abi/3.11.0-12.19/armhf/generic.modules +++ b/debian.master/abi/3.11.0-12.19/armhf/generic.modules @@ -196,8 +196,6 @@ afs ah4 ah6 ahci -ahci_imx -ahci_platform aic79xx aic7xxx aic94xx diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 0c02268..77bf324 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -4,6 +4,7 @@ CONFIG_64BIT=y CONFIG_AC97_BUS=m CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_AHCI_IMX=m CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -70,6 +71,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set CONFIG_RTC_DRV_CMOS=y +CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y CONFIG_SCSI_SPI_ATTRS=y diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic index 8b926aa..bf21d99 100644 --- a/debian.master/config/armhf/config.flavour.generic +++ b/debian.master/config/armhf/config.flavour.generic @@ -2,6 +2,7 @@ # Config options for config.flavour.generic automatically generated by splitconfig.pl # CONFIG_AC97_BUS=y +CONFIG_AHCI_IMX=y CONFIG_ARCH_MXC=y CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y CONFIG_ARCH_NR_GPIO=1024 @@ -23,6 +24,7 @@ CONFIG_MTD_SM_COMMON=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_PCI_SYSCALL=y # CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_SOC_HDMI_CODEC=y diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae index 1ddadd3..d5c1b40 100644 --- a/debian.master/config/armhf/config.flavour.generic-lpae +++ b/debian.master/config/armhf/config.flavour.generic-lpae @@ -2,6 +2,7 @@ # Config options for config.flavour.generic-lpae automatically generated by splitconfig.pl # CONFIG_AC97_BUS=m +CONFIG_AHCI_IMX=m # CONFIG_ARCH_MXC is not set # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_NR_GPIO=0 @@ -23,6 +24,7 @@ CONFIG_HUGETLB_PAGE=y CONFIG_MUSB_PIO_ONLY=y # CONFIG_PCI_SYSCALL is not set CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SND_EMU10K1_SEQ is not set # CONFIG_SND_OPL3_LIB_SEQ is not set CONFIG_SND_SOC_HDMI_CODEC=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bbb64a0..7d47df2 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -171,7 +171,6 @@ CONFIG_AGP_NVIDIA=y CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=y -CONFIG_AHCI_IMX=m CONFIG_AIC79XX_CMDS_PER_DEVICE=32 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 @@ -4969,7 +4968,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SATA_ACARD_AHCI=m CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_INIC162X=m CONFIG_SATA_MV=m CONFIG_SATA_NV=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index a6374bf..bd7149d 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -4,6 +4,7 @@ # CONFIG_64BIT is not set CONFIG_AC97_BUS=m CONFIG_ACPI_BLACKLIST_YEAR=2000 +CONFIG_AHCI_IMX=m CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set @@ -68,6 +69,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RT2800USB_UNKNOWN=y # CONFIG_RT2X00_LIB_DEBUGFS is not set CONFIG_RTC_DRV_CMOS=y +CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_HIGHBANK is not set CONFIG_SCHED_SMT=y CONFIG_SCSI_SPI_ATTRS=y