From patchwork Sat Aug 3 09:10:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 264398 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 9268C2C0096 for ; Sat, 3 Aug 2013 19:11:35 +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 1V5Xrg-0001wZ-Ut; Sat, 03 Aug 2013 09:11:08 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1V5XrN-0001sG-OT for kernel-team@lists.ubuntu.com; Sat, 03 Aug 2013 09:10:49 +0000 Received: from faun.canonical.com ([91.189.93.182] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1V5XrN-0005N0-N9 for kernel-team@lists.ubuntu.com; Sat, 03 Aug 2013 09:10:49 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/7] UBUNTU: [Config] disable Allwinner a1x support (ARCH_SUNXI) Date: Sat, 3 Aug 2013 10:10:43 +0100 Message-Id: <1375521048-19178-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1375521048-19178-1-git-send-email-paolo.pisati@canonical.com> References: <1375521048-19178-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/config/armhf/config.flavour.generic | 1 - debian.master/config/armhf/config.flavour.generic-lpae | 1 - debian.master/config/config.common.ubuntu | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic index 9543ab9..ddcf546 100644 --- a/debian.master/config/armhf/config.flavour.generic +++ b/debian.master/config/armhf/config.flavour.generic @@ -5,7 +5,6 @@ CONFIG_AC97_BUS=y CONFIG_ARCH_MXC=y CONFIG_ARCH_NR_GPIO=1024 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_SUNXI=y CONFIG_ARCH_TEGRA=y # CONFIG_ARM_LPAE is not set # CONFIG_COMPACTION is not set diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae index 5da7ccd..7446090c 100644 --- a/debian.master/config/armhf/config.flavour.generic-lpae +++ b/debian.master/config/armhf/config.flavour.generic-lpae @@ -5,7 +5,6 @@ CONFIG_AC97_BUS=m # CONFIG_ARCH_MXC is not set CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -# CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_TEGRA is not set CONFIG_ARM_LPAE=y CONFIG_COMPACTION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 7559e53..1d0e9e1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -306,6 +306,7 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_SOCFPGA is not set CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_STI=y +# CONFIG_ARCH_SUNXI is not set CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_ARCH_SUPPORTS_MSI=y