Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b929995 authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

arm/imx: fix AUTO_ZRELADDR selection 



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: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 59198b6c

arch/arm/plat-mxc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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