summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-08 19:26:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-08 19:26:28 +0100
commit2d8d24935d372175786ebefa8a2de8680831b67f (patch)
tree9969683b85f94b59e58bdc1a42e543be62029cb1 /arch/arm/mach-mx3/Kconfig
parentc0683039207226afcffbe0fbf6a1caaee77a37b0 (diff)
parenta0895162fbc1a4168c8cf29e1eb1bbc8c260a80a (diff)
downloadlinux-2d8d24935d372175786ebefa8a2de8680831b67f.tar.gz
linux-2d8d24935d372175786ebefa8a2de8680831b67f.tar.bz2
linux-2d8d24935d372175786ebefa8a2de8680831b67f.zip
Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-mx3/Kconfig')
-rw-r--r--arch/arm/mach-mx3/Kconfig21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 229fb3e71fa1..17a21a291e2f 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -57,6 +57,13 @@ config MACH_MX31MOBOARD
Include support for mx31moboard platform. This includes specific
configurations for the board and its peripherals.
+config MACH_MX31LILLY
+ bool "Support MX31 LILLY-1131 platforms (INCO startec)"
+ select ARCH_MX31
+ help
+ Include support for mx31 based LILLY1131 modules. This includes
+ specific configurations for the board and its peripherals.
+
config MACH_QONG
bool "Support Dave/DENX QongEVB-LITE platform"
select ARCH_MX31
@@ -71,4 +78,18 @@ config MACH_PCM043
Include support for Phytec pcm043 platform. This includes
specific configurations for the board and its peripherals.
+config MACH_ARMADILLO5X0
+ bool "Support Atmark Armadillo-500 Development Base Board"
+ select ARCH_MX31
+ help
+ Include support for Atmark Armadillo-500 platform. This includes
+ specific configurations for the board and its peripherals.
+
+config MACH_MX35_3DS
+ bool "Support MX35PDK platform"
+ select ARCH_MX35
+ default n
+ help
+ Include support for MX35PDK platform. This includes specific
+ configurations for the board and its peripherals.
endif