From patchwork Sat Feb 25 19:55:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 6931 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 84D1C23EB0 for ; Sat, 25 Feb 2012 19:55:17 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D7CBA183B2 for ; Sat, 25 Feb 2012 19:55:17 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so6151572iab.11 for ; Sat, 25 Feb 2012 11:55:17 -0800 (PST) Received: from mr.google.com ([10.50.168.74]) by 10.50.168.74 with SMTP id zu10mr6529939igb.26.1330199717155 (num_hops = 1); Sat, 25 Feb 2012 11:55:17 -0800 (PST) Received: by 10.50.168.74 with SMTP id zu10mr5248223igb.26.1330199717088; Sat, 25 Feb 2012 11:55:17 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp37234ibr; Sat, 25 Feb 2012 11:55:16 -0800 (PST) Received: by 10.68.219.232 with SMTP id pr8mr19000903pbc.12.1330199715644; Sat, 25 Feb 2012 11:55:15 -0800 (PST) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id t9si11077893pbi.103.2012.02.25.11.55.15 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 25 Feb 2012 11:55:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) smtp.mail=mathieu.poirier@linaro.org Received: by dald2 with SMTP id d2so4078542dal.37 for ; Sat, 25 Feb 2012 11:55:15 -0800 (PST) Received-SPF: pass (google.com: domain of mathieu.poirier@linaro.org designates 10.68.135.71 as permitted sender) client-ip=10.68.135.71; Received: from mr.google.com ([10.68.135.71]) by 10.68.135.71 with SMTP id pq7mr22687343pbb.27.1330199715465 (num_hops = 1); Sat, 25 Feb 2012 11:55:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.135.71 with SMTP id pq7mr19020721pbb.27.1330199715413; Sat, 25 Feb 2012 11:55:15 -0800 (PST) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id q1sm7909864pbv.49.2012.02.25.11.55.14 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 25 Feb 2012 11:55:14 -0800 (PST) From: mathieu.poirier@linaro.org To: linus.walleij@linaro.org Cc: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, patches@linaro.org Subject: [PATCH 2/6] ARM: ux500: Add board autoselection Date: Sat, 25 Feb 2012 12:55:03 -0700 Message-Id: <1330199707-5179-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330199707-5179-1-git-send-email-mathieu.poirier@linaro.org> References: <1330199707-5179-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQlBPKUQhlPXo+BE/ydjGDG9RQ5rJw3MDP3oEM5W/tYJRkgDMdHzPW1iqgRh/TsqC9rv/h4a From: Arnd Bergmann At least one platform needs to be selected, so pick the u8500 development board if nothing else is selected. The first menu to choose the actual platform is meaningless and can be made invisible. Signed-off-by: Arnd Bergmann Signed-off-by: Mathieu Poirier --- arch/arm/mach-ux500/Kconfig | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 5cfa539..dc488de 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -9,24 +9,20 @@ config UX500_SOC_COMMON select ARM_ERRATA_754322 select ARM_ERRATA_764369 -menu "Ux500 SoC" - config UX500_SOC_DB5500 - bool "DB5500" + bool select MFD_DB5500_PRCMU config UX500_SOC_DB8500 - bool "DB8500" + bool select MFD_DB8500_PRCMU select REGULATOR_DB8500_PRCMU -endmenu - menu "Ux500 target platform (boards)" config MACH_U8500 bool "U8500 Development platform" - depends on UX500_SOC_DB8500 + select UX500_SOC_DB8500 select TPS6105X select SOC_BUS help @@ -34,22 +30,30 @@ config MACH_U8500 config MACH_HREFV60 bool "U85000 Development platform, HREFv60 version" - depends on UX500_SOC_DB8500 + select UX500_SOC_DB8500 help Include support for the HREFv60 new development platform. config MACH_SNOWBALL bool "U8500 Snowball platform" - depends on UX500_SOC_DB8500 select MACH_U8500 help Include support for the snowball development platform. config MACH_U5500 bool "U5500 Development platform" - depends on UX500_SOC_DB5500 + select UX500_SOC_DB5500 help Include support for the U5500 development platform. + +config UX500_AUTO_PLATFORM + def_bool y + depends on !MACH_U5500 + select MACH_U8500 + help + At least one platform needs to be selected in order to build + a working kernel. If everything else is disabled, this + automatically enables MACH_U8500. endmenu config UX500_DEBUG_UART