From patchwork Fri Oct 14 15:59:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: ARM: mutually exclude ZBOOT_ROM and AUTO_ZRELADDR Date: Fri, 14 Oct 2011 05:59:05 -0000 From: Olof Johansson X-Patchwork-Id: 119842 Message-Id: <1318607945-6807-1-git-send-email-olof@lixom.net> To: Russell King - ARM Linux Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, ccross@android.com, arnd@arndb.de, swarren@nvidia.com, pdeschrijver@nvidia.com, Olof Johansson This way platforms that want it can select AUTO_ZRELADDR without issues caused by someone manually also enabling ZBOOT_ROM. Signed-off-by: Olof Johansson Acked-by: Nicolas Pitre --- arch/arm/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Russell King wrote at Friday, October 14, 2011 1:15 AM: > I'll point out that this makes Tegra incompatible with ZBOOT_ROM, which > can still be enabled. ZBOOT_ROM=y AUTO_ZRELADDR=y is an invalid > configuration at runtime. Ah, looks like the dependency is only one-way. Since they are mutually exclusive, how about the below? diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 82973b2..2ad58e8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1814,6 +1814,7 @@ config ZBOOT_ROM_BSS config ZBOOT_ROM bool "Compressed boot loader in ROM/flash" depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS + depends on !AUTO_ZRELADDR help Say Y here if you intend to execute your compressed kernel image (zImage) directly from ROM or flash. If unsure, say N.