Commit be1a17ff689 ("mx7_common: use Kconfig for ARMv7 non-secure mode")
breaks the boot of a NXP 4.1.15 kernel using
mx7dsabresd_secure_defconfig target.

This problem happens because after this commit 
non-secure mode is always selected at CPU level.

Fix this by only selecting CPU_V7_HAS_NONSEC if the MX7_SEC board
option is unset.

Signed-off-by: Fabio Estevam <fabio.este...@nxp.com>
---
 arch/arm/cpu/armv7/mx7/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig
index dd51384..d1a8f50 100644
--- a/arch/arm/cpu/armv7/mx7/Kconfig
+++ b/arch/arm/cpu/armv7/mx7/Kconfig
@@ -4,7 +4,7 @@ config MX7
        bool
        select ROM_UNIFIED_SECTIONS
        select CPU_V7_HAS_VIRT
-       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_NONSEC if !MX7_SEC
        default y
 
 config MX7D
-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to