aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-14 06:01:05 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-14 06:01:05 -0400
commit06099961002a813324d057a91695af7c72939da6 (patch)
treed55ee7a8833c95ee2afb6914bb8a2977cbb9fa31 /arch/arm/Kconfig
parent4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (diff)
parentc11c22177ae2929598051a39e4655be4a42cb805 (diff)
Merge branch 'stmp' into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3473f8b8ede6..fee7c64ca723 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -298,6 +298,19 @@ config ARCH_MXC
298 help 298 help
299 Support for Freescale MXC/iMX-based family of processors 299 Support for Freescale MXC/iMX-based family of processors
300 300
301config ARCH_STMP3XXX
302 bool "Freescale STMP3xxx"
303 select CPU_ARM926T
304 select HAVE_CLK
305 select COMMON_CLKDEV
306 select ARCH_REQUIRE_GPIOLIB
307 select GENERIC_TIME
308 select GENERIC_CLOCKEVENTS
309 select GENERIC_GPIO
310 select USB_ARCH_HAS_EHCI
311 help
312 Support for systems based on the Freescale 3xxx CPUs.
313
301config ARCH_NETX 314config ARCH_NETX
302 bool "Hilscher NetX based" 315 bool "Hilscher NetX based"
303 select CPU_ARM926T 316 select CPU_ARM926T
@@ -673,6 +686,8 @@ source "arch/arm/mach-s3c6400/Kconfig"
673source "arch/arm/mach-s3c6410/Kconfig" 686source "arch/arm/mach-s3c6410/Kconfig"
674endif 687endif
675 688
689source "arch/arm/plat-stmp3xxx/Kconfig"
690
676source "arch/arm/mach-lh7a40x/Kconfig" 691source "arch/arm/mach-lh7a40x/Kconfig"
677 692
678source "arch/arm/mach-h720x/Kconfig" 693source "arch/arm/mach-h720x/Kconfig"