All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 7/9] mx7_common: use Kconfig for ARMv7 non-secure mode
Date: Wed, 13 Jul 2016 00:25:41 -0700	[thread overview]
Message-ID: <20160713072543.3576-8-stefan@agner.ch> (raw)
In-Reply-To: <20160713072543.3576-1-stefan@agner.ch>

From: Stefan Agner <stefan.agner@toradex.com>

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>
---

 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 ecfa4a2..dd51384 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 d6dafcd..b3a708e 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 f0c165b..28a3dfd 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 5dd6207..9f80f9f 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.9.0

  parent reply	other threads:[~2016-07-13  7:25 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-13  7:25 [U-Boot] [PATCH v2 0/9] mx7: add Colibri iMX7S/iMX7D support Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 1/9] dm: imx: serial: Support DTE mode when using driver model Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 2/9] usb: move CONFIG_USB_EHCI_MX7 to Kconfig Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 3/9] usb: ehci-mx6: configure power polarity in usb_power_config Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 4/9] usb: ehci-mx6: introduce config for high active power pin Stefan Agner
2016-07-13 12:11   ` Otavio Salvador
2016-07-13 16:03     ` Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 5/9] mx7: set soc environment according to exact SoC type Stefan Agner
2016-07-18 22:19   ` Fabio Estevam
2016-07-18 22:21     ` Stefan Agner
2016-07-19  0:36       ` Tom Rini
2016-07-19  2:19         ` Stefan Agner
2016-07-19 12:33           ` Tom Rini
2016-07-19 13:59         ` Stefano Babic
2016-07-19 14:06           ` Fabio Estevam
2016-07-19 14:21             ` Stefano Babic
2016-07-13  7:25 ` [U-Boot] [PATCH v2 6/9] mx7_common: Put display board info config into board file Stefan Agner
2016-07-13  7:25 ` Stefan Agner [this message]
2016-07-13  7:25 ` [U-Boot] [PATCH v2 8/9] imx_watchdog: add weak attribute to reset_cpu function Stefan Agner
2016-07-13  7:25 ` [U-Boot] [PATCH v2 9/9] colibri_imx7: add Colibri iMX7S/iMX7D module support Stefan Agner
2016-07-19 14:14   ` Stefano Babic
2016-07-19 16:05     ` Stefan Agner
2016-07-19 16:26       ` Stefano Babic
2016-07-18 20:59 ` [U-Boot] [PATCH v2 0/9] mx7: add Colibri iMX7S/iMX7D support Stefan Agner
2016-07-19 14:18   ` stefano
2016-07-19 16:09     ` Stefan Agner
2016-07-19 16:58       ` Stefano Babic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160713072543.3576-8-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.