From patchwork Wed Apr 17 13:09:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 237219 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 11C582C014E for ; Wed, 17 Apr 2013 23:09:13 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1USS6i-0002sJ-NF; Wed, 17 Apr 2013 13:09:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1USS6h-0002s4-M3 for kernel-team@lists.ubuntu.com; Wed, 17 Apr 2013 13:09:03 +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 1USS6h-0002st-JH for kernel-team@lists.ubuntu.com; Wed, 17 Apr 2013 13:09:03 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] disable PL330_DMA Date: Wed, 17 Apr 2013 15:09:01 +0200 Message-Id: <1366204141-16404-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366204141-16404-1-git-send-email-paolo.pisati@canonical.com> References: <1366204141-16404-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 BugLink: http://bugs.launchpad.net/bugs/1168039 BugLink: http://bugs.launchpad.net/bugs/1166956 Signed-off-by: Paolo Pisati --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 815f1e7..611283f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -56,6 +56,7 @@ CONFIG_NR_CPUS=256 CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PCCARD=m CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PL330_DMA=m CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index be7ca03..ca2d614 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -49,6 +49,7 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_NR_CPUS=4 # CONFIG_PCCARD is not set # CONFIG_PHYS_ADDR_T_64BIT is not set +# CONFIG_PL330_DMA is not set CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8df3b86..d98c02c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4346,7 +4346,6 @@ CONFIG_PL310_ERRATA_727915=y CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y CONFIG_PL320_MBOX=y -CONFIG_PL330_DMA=m # CONFIG_PLAT_SPEAR is not set CONFIG_PLAT_VERSATILE=y CONFIG_PLAT_VERSATILE_CLCD=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1b08238..9722a09 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -55,6 +55,7 @@ CONFIG_NR_CPUS=8 CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PCCARD=m CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PL330_DMA=m CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m