From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] arm/imx: fix AUTO_ZRELADDR selection
Date: Thu, 10 Nov 2011 16:39:31 +0800 [thread overview]
Message-ID: <1320914372-4416-4-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1320914372-4416-1-git-send-email-shawn.guo@linaro.org>
The AUTO_ZRELADDR selection for ARCH_IMX_V4_V5 and ARCH_MX5 should
really be mutually exclusive to ZBOOT_ROM just like what ARCH_IMX_V6_V7
does.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
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 a08a951..b3a1f2b 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
--
1.7.4.1
next prev parent reply other threads:[~2011-11-10 8:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 8:39 [PATCH 0/4] imx: a few fixes for v3.2-rc Shawn Guo
2011-11-10 8:39 ` [PATCH 1/4] arm/imx: fix mx3_defconfig to add FEC back Shawn Guo
2011-11-10 8:49 ` Richard Zhao
2011-11-10 8:57 ` Uwe Kleine-König
2011-11-11 7:16 ` Shawn Guo
2011-11-11 10:12 ` Uwe Kleine-König
2011-11-11 15:58 ` Sascha Hauer
2011-11-11 23:26 ` Shawn Guo
2011-11-10 8:39 ` [PATCH 2/4] arm/imx: fix the references to ARCH_MX3 Shawn Guo
2011-11-10 8:49 ` Sascha Hauer
2011-11-11 7:37 ` [PATCH v2] " Shawn Guo
2011-11-21 13:47 ` Paul Bolle
2011-11-22 10:43 ` Sascha Hauer
2011-11-22 10:50 ` Paul Bolle
2011-11-10 8:39 ` Shawn Guo [this message]
2011-11-10 8:39 ` [PATCH 4/4] arm/imx: fix imx6q mmc error when mounting rootfs Shawn Guo
2011-11-10 13:44 ` Dirk Behme
2011-11-10 15:07 ` Jason Liu
2011-11-11 7:47 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320914372-4416-4-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).