From be1a17ff689b0289bbf900813265e4525949eef7 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 13 Jul 2016 00:25:41 -0700 Subject: [PATCH] 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 --- arch/arm/cpu/armv7/mx7/Kconfig | 2 ++ configs/mx7dsabresd_defconfig | 1 + configs/warp7_defconfig | 1 + include/configs/mx7_common.h | 7 ------- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index ecfa4a2c35..dd513842ea 100644 --- 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 d6dafcd289..b3a708e192 100644 --- 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 3770669462..5a68998eb0 100644 --- 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 5dd6207f69..9f80f9f961 100644 --- 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 -- 2.25.1