From patchwork Mon Feb 14 06:43:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 553891 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1E6hPBP000382 for ; Mon, 14 Feb 2011 06:43:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751102Ab1BNGnZ (ORCPT ); Mon, 14 Feb 2011 01:43:25 -0500 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:36682 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096Ab1BNGnY convert rfc822-to-8bit (ORCPT ); Mon, 14 Feb 2011 01:43:24 -0500 Received: from source ([65.219.4.129]) (using TLSv1) by na3sys009aob101.postini.com ([74.125.148.12]) with SMTP ID DSNKTVjPCBR0kftJ4AlhZftZ03CeuIRlANem@postini.com; Sun, 13 Feb 2011 22:43:24 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by SC-OWA01.marvell.com ([10.93.76.21]) with mapi; Sun, 13 Feb 2011 22:42:16 -0800 From: Philip Rakity To: "linux-arm-kernel@lists.infradead.org" CC: "linux-mmc@vger.kernel.org" , Mark Brown , Chris Ball , Arnd Bergmann Date: Sun, 13 Feb 2011 22:43:17 -0800 Subject: [[PATCH 1/4] arm: mach-mmp: Fix Kconfig to allow correct PXA Selections Thread-Topic: [[PATCH 1/4] arm: mach-mmp: Fix Kconfig to allow correct PXA Selections Thread-Index: AcvMEnZvWNCK1KnWQm2UIFdqwhqaHg== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 14 Feb 2011 06:43:46 +0000 (UTC) diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 67793a6..4739d27 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -1,99 +1,97 @@ if ARCH_MMP -menu "Marvell PXA168/910/MMP2 Implmentations" +menu "Marvell PXA168/PXA910/MMP2 Specific Features" + +choice + prompt "SoC (System on Chip)" + help + Type of System on Chip (SoC) used + +config CPU_PXA168 + bool "PXA168 Based System" + select CPU_MOHAWK + help + Say 'Y' here if System has a Marvell PXA168 SoC + +config CPU_PXA910 + bool "PXA910 Based System" + select CPU_MOHAWK + help + Say 'Y' here if System has a Marvell PXA910 SoC + +config CPU_MMP2 + bool "MMP2 Based System" + select CPU_PJ4 + help + Say 'Y' here if System has a Marvell MMP2 SoC + +endchoice + +comment "Development Board" config MACH_ASPENITE bool "Marvell's PXA168 Aspenite Development Board" - select CPU_PXA168 + depends on CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based Aspenite Development Board. config MACH_ZYLONITE2 bool "Marvell's PXA168 Zylonite2 Development Board" - select CPU_PXA168 + depends on CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based Zylonite2 Development Board. config MACH_AVENGERS_LITE bool "Marvell's PXA168 Avengers Lite Development Board" - select CPU_PXA168 + depends on CPU_PXA168 help Say 'Y' here if you want to support the Marvell PXA168-based Avengers Lite Development Board. +config MACH_TETON_BGA + bool "Marvell's PXA168 Teton BGA Development Board" + depends on CPU_PXA168 + help + Say 'Y' here if you want to support the Marvell PXA168-based + Teton BGA Development Board. + config MACH_TAVOREVB bool "Marvell's PXA910 TavorEVB Development Board" - select CPU_PXA910 + depends on CPU_PXA910 help Say 'Y' here if you want to support the Marvell PXA910-based TavorEVB Development Board. config MACH_TTC_DKB - bool "Marvell's PXA910 TavorEVB Development Board" - select CPU_PXA910 + bool "Marvell's PXA910 TTC DKB Development Board" + depends on CPU_PXA910 help Say 'Y' here if you want to support the Marvell PXA910-based TTC_DKB Development Board. config MACH_BROWNSTONE bool "Marvell's Brownstone Development Platform" - depends on !CPU_MOHAWK - select CPU_MMP2 + depends on CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based - Brown Development Platform. - MMP2-based board can't be co-existed with PXA168-based & - PXA910-based development board. Since MMP2 is compatible to - ARMv7 architecture. + Brownstone Development Board. config MACH_FLINT bool "Marvell's Flint Development Platform" - depends on !CPU_MOHAWK - select CPU_MMP2 + depends on CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-based - Flint Development Platform. - MMP2-based board can't be co-existed with PXA168-based & - PXA910-based development board. Since MMP2 is compatible to - ARMv7 architecture. + Flint Development Board. config MACH_MARVELL_JASPER bool "Marvell's Jasper Development Platform" - depends on !CPU_MOHAWK - select CPU_MMP2 + depends on CPU_MMP2 help Say 'Y' here if you want to support the Marvell MMP2-base - Jasper Development Platform. - MMP2-based board can't be co-existed with PXA168-based & - PXA910-based development board. Since MMP2 is compatible to - ARMv7 architecture. - -config MACH_TETON_BGA - bool "Marvell's PXA168 Teton BGA Development Board" - select CPU_PXA168 - help - Say 'Y' here if you want to support the Marvell PXA168-based - Teton BGA Development Board. + Jasper Development Board. endmenu -config CPU_PXA168 - bool - select CPU_MOHAWK - help - Select code specific to PXA168 - -config CPU_PXA910 - bool - select CPU_MOHAWK - help - Select code specific to PXA910 - -config CPU_MMP2 - bool - select CPU_PJ4 - help - Select code specific to MMP2. MMP2 is ARMv7 compatible. endif