mx7_common: use Kconfig for ARMv7 non-secure mode

Use existing Kconfig symbols to let the user configure whether to
build a U-Boot with non-secure mode support or not. This also allows
to enable virtualization extension easily.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig
index ecfa4a2c3565d77b7a55845540e199c12abed48b..dd513842ead05c6a5e8d0ab0c5d8cce2da9af3d7 100644 (file)
--- a/arch/arm/cpu/armv7/mx7/Kconfig
+++ b/arch/arm/cpu/armv7/mx7/Kconfig
@@ -3,6 +3,8 @@ if ARCH_MX7
 config MX7
        bool
        select ROM_UNIFIED_SECTIONS
+       select CPU_V7_HAS_VIRT
+       select CPU_V7_HAS_NONSEC
        default y
 
 config MX7D

diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index d6dafcd289923f7591c3b8cc5989475790ed7afd..b3a708e192aed85433a694928f4d51b9276f3590 100644 (file)
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX7=y
 CONFIG_TARGET_MX7DSABRESD=y
+# CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"

diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 37706694624e1ca9cb868bedff42e4e9a02e8978..5a68998eb0b698fcc28985338c96f066bcce6a91 100644 (file)
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX7=y
 CONFIG_TARGET_WARP7=y
+# CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 5dd6207f69ef69cc7bbdeacd6ceb97ea7d7e6d8f..9f80f9f9617fcdb501d190293448a075fa4a5bdc 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -71,15 +71,8 @@
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 
-/*
- * Default boot linux kernel in no secure mode.
- * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
- */
-#ifndef CONFIG_MX7_SEC
-#define CONFIG_ARMV7_NONSEC
 #define CONFIG_ARMV7_PSCI
 #define CONFIG_ARMV7_PSCI_NR_CPUS      2
 #define CONFIG_ARMV7_SECURE_BASE       0x00900000
-#endif
 
 #endif