From mboxrd@z Thu Jan 1 00:00:00 1970 From: nico@fluxnic.net (Nicolas Pitre) Date: Fri, 14 Oct 2011 14:04:50 -0400 (EDT) Subject: [PATCH] ARM: mutually exclude ZBOOT_ROM and AUTO_ZRELADDR In-Reply-To: <1318607945-6807-1-git-send-email-olof@lixom.net> References: <20111014071500.GP21648@n2100.arm.linux.org.uk> <1318607945-6807-1-git-send-email-olof@lixom.net> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 14 Oct 2011, Olof Johansson wrote: > 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 Certainly harmless for the time being. > --- > 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. > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >