diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-25 14:01:49 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-25 14:01:49 +0100 |
| commit | 9b1489e989695c4d502865f8bec616c0f17e99ab (patch) | |
| tree | 9f90bcc7491bec06db0463d5f24f1ac19b8becc4 /arch/arm/plat-mxc/Kconfig | |
| parent | arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode (diff) | |
| parent | mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level (diff) | |
| download | linux-9b1489e989695c4d502865f8bec616c0f17e99ab.tar.xz linux-9b1489e989695c4d502865f8bec616c0f17e99ab.zip | |
Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled
in 03e09cd8902717b66f940357257d8ad76114d9f2.
arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32
and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad565c9bbceeed8b607f140c29df97355, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.
Conflicts:
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/iomux-mx1-mx2.c
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 6debae2c798d..7f7ad6f289bd 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -23,6 +23,8 @@ config ARCH_MX2 config ARCH_MX25 bool "MX25-based" select CPU_ARM926T + select ARCH_MXC_IOMUX_V3 + select HAVE_FB_IMX help This enables support for systems based on the Freescale i.MX25 family @@ -38,6 +40,12 @@ config ARCH_MXC91231 help This enables support for systems based on the Freescale MXC91231 family +config ARCH_MX5 + bool "MX5-based" + select CPU_V7 + help + This enables support for systems based on the Freescale i.MX51 family + endchoice source "arch/arm/mach-mx1/Kconfig" @@ -45,6 +53,7 @@ source "arch/arm/mach-mx2/Kconfig" source "arch/arm/mach-mx3/Kconfig" source "arch/arm/mach-mx25/Kconfig" source "arch/arm/mach-mxc91231/Kconfig" +source "arch/arm/mach-mx5/Kconfig" endmenu @@ -58,6 +67,14 @@ config MXC_IRQ_PRIOR requirements for timing. Say N here, unless you have a specialized requirement. +config MXC_TZIC + bool "Enable TrustZone Interrupt Controller" + depends on ARCH_MX51 + help + This will be automatically selected for all processors + containing this interrupt controller. + Say N here only if you are really sure. + config MXC_PWM tristate "Enable PWM driver" select HAVE_PWM |