From patchwork Tue Nov 20 17:18:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1775011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 42E7B3FD1A for ; Tue, 20 Nov 2012 17:20:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TarTO-0007X0-Mi; Tue, 20 Nov 2012 17:18:58 +0000 Received: from mail-yh0-f49.google.com ([209.85.213.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TarTK-0007Vx-Qo for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2012 17:18:55 +0000 Received: by mail-yh0-f49.google.com with SMTP id j52so86581yhj.36 for ; Tue, 20 Nov 2012 09:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=3jGfL6WfNrn64iSU7BJB037q1LNJJ8buTD8kXIAVAeo=; b=ahfArrlR4IoXmjUQqxEwCvlnRTtxkdxZ8GLCxcS+D9/oj7A+cVQWHqEakkBS5Wp/1B M7mwsmVRKevkzFAzVuCbil2+E3Qah3q3mZayjg2cCiIm9fBrX/z/Z/m/B+MASIzh2tnC KtmV3y4aFI7RusPrKjmFn+ngSG+wLl5g7ICTDfUVDXEEmqq+zjPl33LuYIe/BB1rLFAl zUkECTQLxjNSHeYR65WyNkwzjUSJ17YlhbFLgt1j7sqUoXt2oeULYq3ZR+YekBu280y/ F0MFmo/dhIqU6AaHOwqYZ3EJNahPmB6Rq6eTC3vmuXe1cDey/+v2LOxcJvfQEKf/Hafh Xsxg== Received: by 10.236.126.196 with SMTP id b44mr16036537yhi.21.1353431931569; Tue, 20 Nov 2012 09:18:51 -0800 (PST) Received: from fabio-Latitude-E6410.cps.virtua.com.br ([189.61.223.46]) by mx.google.com with ESMTPS id t14sm12004623anl.17.2012.11.20.09.18.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Nov 2012 09:18:50 -0800 (PST) From: Fabio Estevam To: rob.herring@calxeda.com Subject: [PATCH v2] ARM: Kconfig: Do not force selection of ARCH_VEXPRESS by ARCH_MULTI_V7 Date: Tue, 20 Nov 2012 15:18:38 -0200 Message-Id: <1353431918-9326-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121120_121854_970621_DA6EBB58 X-CRM114-Status: GOOD ( 13.00 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: thomas.petazzoni@free-electrons.com, Fabio Estevam , linux@arm.linux.org.uk, pawel.moll@arm.com, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Fabio Estevam When building a kernel using imx_v6_v7_defconfig, it is not possible to unselect ARCH_VEXPRESS due to the fact that it is automatically selected by ARCH_MULTI_V7. This is not good when someone wants to create a minimal kernel build, so let multi_v7_defconfig select ARCH_VEXPRESS instead. Also avoid build breakage when randconfig selects no platform. Signed-off-by: Fabio Estevam Acked-by: Rob Herring --- Changes since v1: - Avoid build breakage on randconfig for the case that no platform is selected. arch/arm/Kconfig | 2 +- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm/kernel/vmlinux.lds.S | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 14f8160..372cb4e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -267,6 +267,7 @@ choice config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" depends on MMU + select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR select COMMON_CLK @@ -1000,7 +1001,6 @@ config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" default y select ARCH_MULTI_V6_V7 - select ARCH_VEXPRESS select CPU_V7 config ARCH_MULTI_V6_V7 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 159f75f..531c538 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SOCFPGA=y +CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b9f38e3..aa46be8 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -310,4 +310,6 @@ SECTIONS * binutils is too old (for other reasons as well) */ ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") +#ifndef CONFIG_ARCH_MULTIPLATFORM ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") +#endif