summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-11-11 08:53:46 -0800
committerOlof Johansson <olof@lixom.net>2011-11-11 08:53:46 -0800
commit09d37c4ba9b20d6b694bfd7339850ba9a826fb13 (patch)
tree2ee2fdf15e72e450bbfccd9733205b265da0538f /arch/arm/plat-mxc
parent3cdc3acc62527ab9544c2820b5e5da482a105240 (diff)
parentf750ba9b8db2a926c315ccfa9e95d12fe4590a22 (diff)
downloadblackbird-op-linux-09d37c4ba9b20d6b694bfd7339850ba9a826fb13.tar.gz
blackbird-op-linux-09d37c4ba9b20d6b694bfd7339850ba9a826fb13.zip
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index a08a95107a63..b3a1f2b3ada3 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -10,7 +10,7 @@ choice
config ARCH_IMX_V4_V5
bool "i.MX1, i.MX21, i.MX25, i.MX27"
- select AUTO_ZRELADDR
+ select AUTO_ZRELADDR if !ZBOOT_ROM
select ARM_PATCH_PHYS_VIRT
help
This enables support for systems based on the Freescale i.MX ARMv4
@@ -26,7 +26,7 @@ config ARCH_IMX_V6_V7
config ARCH_MX5
bool "i.MX50, i.MX51, i.MX53"
- select AUTO_ZRELADDR
+ select AUTO_ZRELADDR if !ZBOOT_ROM
select ARM_PATCH_PHYS_VIRT
help
This enables support for machines using Freescale's i.MX50 and i.MX53
OpenPOWER on IntegriCloud