diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 17:14:17 +0100 |
commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/plat-mxc/Kconfig | |
parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
-rw-r--r-- | arch/arm/plat-mxc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index baf9064c084..88e1e2e7a20 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -10,16 +10,16 @@ choice config ARCH_IMX_V4_V5 bool "i.MX1, i.MX21, i.MX25, i.MX27" - select AUTO_ZRELADDR if !ZBOOT_ROM select ARM_PATCH_PHYS_VIRT + select AUTO_ZRELADDR if !ZBOOT_ROM help This enables support for systems based on the Freescale i.MX ARMv4 and ARMv5 SoCs config ARCH_IMX_V6_V7 bool "i.MX3, i.MX5, i.MX6" - select AUTO_ZRELADDR if !ZBOOT_ROM select ARM_PATCH_PHYS_VIRT + select AUTO_ZRELADDR if !ZBOOT_ROM select MIGHT_HAVE_CACHE_L2X0 help This enables support for systems based on the Freescale i.MX3, i.MX5 |