diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 21:08:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 21:08:03 -0700 |
| commit | 994c0e992522c123298b4a91b72f5e67ba2d1123 (patch) | |
| tree | 411952f844b8e1d5ef2854e44df793529078d3eb /arch/arm/plat-mxc/Kconfig | |
| parent | Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | Merge branch 'imx/imx6q' into next/soc (diff) | |
| download | linux-dev-994c0e992522c123298b4a91b72f5e67ba2d1123.tar.xz linux-dev-994c0e992522c123298b4a91b72f5e67ba2d1123.zip | |
Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
MAINTAINERS: add ARM/FREESCALE IMX6 entry
arm/imx: merge i.MX3 and i.MX6
arm/imx6q: add suspend/resume support
arm/imx6q: add device tree machine support
arm/imx6q: add smp and cpu hotplug support
arm/imx6q: add core drivers clock, gpc, mmdc and src
arm/imx: add gic_handle_irq function
arm/imx6q: add core definitions and low-level debug uart
arm/imx6q: add device tree source
ARM: highbank: add suspend support
ARM: highbank: Add cpu hotplug support
ARM: highbank: add SMP support
MAINTAINERS: add Calxeda Highbank ARM platform
ARM: add Highbank core platform support
ARM: highbank: add devicetree source
ARM: l2x0: add empty l2x0_of_init
picoxcell: add a definition of VMALLOC_END
picoxcell: remove custom ioremap implementation
picoxcell: add the DTS for the PC7302 board
picoxcell: add the DTS for pc3x2 and pc3x3 devices
...
Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
by Arnd).
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 4bdc975581eb..a08a95107a63 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -6,7 +6,7 @@ menu "Freescale MXC Implementations" choice prompt "Freescale CPU family:" - default ARCH_MX3 + default ARCH_IMX_V6_V7 config ARCH_IMX_V4_V5 bool "i.MX1, i.MX21, i.MX25, i.MX27" @@ -16,10 +16,13 @@ config ARCH_IMX_V4_V5 This enables support for systems based on the Freescale i.MX ARMv4 and ARMv5 SoCs -config ARCH_MX3 - bool "MX3-based" +config ARCH_IMX_V6_V7 + bool "i.MX3, i.MX6" + select AUTO_ZRELADDR if !ZBOOT_ROM + select ARM_PATCH_PHYS_VIRT help - This enables support for systems based on the Freescale i.MX3 family + This enables support for systems based on the Freescale i.MX3 and i.MX6 + family. config ARCH_MX5 bool "i.MX50, i.MX51, i.MX53" |