Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf50e23 authored by Russell King's avatar Russell King
Browse files

ARM: Fix sorting of platform group config options and includes 



... and document the sorting criteria to help future additions.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8e4971f2

arch/arm/Kconfig

+45 −36
Original line number Original line Diff line number Diff line
@@ -218,6 +218,10 @@ config MMU 
	  Select if you want MMU-based virtualised addressing space

	  Select if you want MMU-based virtualised addressing space

	  support by paged memory management. If unsure, say 'Y'.

	  support by paged memory management. If unsure, say 'Y'.





#

# The "ARM system type" choice list is ordered alphabetically by option

# text.  Please add new entries in the option alphabetic order.

#

choice

choice

	prompt "ARM system type"

	prompt "ARM system type"

	default ARCH_VERSATILE

	default ARCH_VERSATILE
@@ -274,6 +278,18 @@ config ARCH_AT91 
	  This enables support for systems based on the Atmel AT91RM9200,

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 and AT91CAP9 processors.





config ARCH_BCMRING

	bool "Broadcom BCMRING"

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Support for Broadcom's BCMRing platform.



config ARCH_CLPS711X

config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T

	select CPU_ARM720T
@@ -359,20 +375,6 @@ config ARCH_H720X 
	help

	help

	  This enables support for systems based on the Hynix HMS720x

	  This enables support for systems based on the Hynix HMS720x





config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson



config ARCH_IOP13XX

config ARCH_IOP13XX

	bool "IOP13xx-based"

	bool "IOP13xx-based"

	depends on MMU

	depends on MMU
@@ -747,6 +749,30 @@ config ARCH_U300 
	help

	help

	  Support for ST-Ericsson U300 series mobile platforms.

	  Support for ST-Ericsson U300 series mobile platforms.





config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	help

	  Support for ST-Ericsson's Ux500 architecture



config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson



config ARCH_DAVINCI

config ARCH_DAVINCI

	bool "TI DaVinci"

	bool "TI DaVinci"

	select CPU_ARM926T

	select CPU_ARM926T
@@ -775,30 +801,13 @@ config ARCH_OMAP 
	help

	help

	  Support for TI's OMAP platform (OMAP1 and OMAP2).

	  Support for TI's OMAP platform (OMAP1 and OMAP2).





config ARCH_BCMRING

	bool "Broadcom BCMRING"

	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Support for Broadcom's BCMRing platform.



config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	select CPU_V7

	select ARM_AMBA

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	help

	  Support for ST-Ericsson's Ux500 architecture



endchoice

endchoice





#

# This is sorted alphabetically by mach-* pathname.  However, plat-*

# Kconfigs may be included either alphabetically (according to the

# plat- suffix) or along side the corresponding mach-* source.

#

source "arch/arm/mach-aaec2000/Kconfig"

source "arch/arm/mach-aaec2000/Kconfig"





source "arch/arm/mach-at91/Kconfig"

source "arch/arm/mach-at91/Kconfig"