Commit 10968131 authored by Russell King's avatar Russell King
Browse files

Fix select-induced Kconfig warning for ZBOOT_ROM 



warning: (ARCH_MULTIPLATFORM && ARCH_CLPS711X && ARCH_PXA &&
 SOC_EXYNOS5440 && ARCH_EMEV2) selects AUTO_ZRELADDR which
 has unmet direct dependencies (!ZBOOT_ROM)

This is because it's possible to have ZBOOT_ROM enabled, but at the
same time have another option enabled which selects AUTO_ZRELADDR
overriding the !ZBOOT_ROM dependency.  Fix this by reversing the
dependencies between ZBOOT_ROM and the options which depend on
!ZBOOT_ROM.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 753d1243

arch/arm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -1945,6 +1945,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 !ARM_APPENDED_DTB && !XIP_KERNEL && !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.
@@ -1980,7 +1981,7 @@ endchoice 


config ARM_APPENDED_DTB

	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"

	depends on OF && !ZBOOT_ROM

	depends on OF

	help

	  With this option, the boot code will look for a device tree binary

	  (DTB) appended to zImage
@@ -2068,7 +2069,7 @@ endchoice 


config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on !ZBOOT_ROM && !ARM_LPAE && !ARCH_MULTIPLATFORM

	depends on !ARM_LPAE && !ARCH_MULTIPLATFORM

	help

	  Execute-In-Place allows the kernel to run from non-volatile storage

	  directly addressable by the CPU, such as NOR flash. This saves RAM
@@ -2131,7 +2132,6 @@ config CRASH_DUMP 


config AUTO_ZRELADDR

	bool "Auto calculation of the decompressed kernel image address"

	depends on !ZBOOT_ROM

	help

	  ZRELADDR is the physical address where the decompressed kernel

	  image will be placed. If AUTO_ZRELADDR is selected, the address

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ config ARCH_MXC 
	select ARCH_REQUIRE_GPIOLIB

	select ARM_CPU_SUSPEND if PM

	select ARM_PATCH_PHYS_VIRT

	select AUTO_ZRELADDR if !ZBOOT_ROM

	select CLKSRC_MMIO

	select COMMON_CLK

	select GENERIC_ALLOCATOR

CRA Git | Maintained and supported by SUSTech CRA and CCSE