From patchwork Wed Jul 13 07:25:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 647754 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rq9QP1tVQz9sCZ for ; Wed, 13 Jul 2016 17:27:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=agner.ch header.i=@agner.ch header.b=rGtWIr8F; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 62F68A7580; Wed, 13 Jul 2016 09:26:50 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eYBTnvhvMq7q; Wed, 13 Jul 2016 09:26:50 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68253A7597; Wed, 13 Jul 2016 09:26:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10E08A7553 for ; Wed, 13 Jul 2016 09:26:29 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rf-G8av0bAFE for ; Wed, 13 Jul 2016 09:26:28 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.kmu-office.ch (mail.kmu-office.ch [178.209.48.109]) by theia.denx.de (Postfix) with ESMTPS id 00BCDA757A for ; Wed, 13 Jul 2016 09:26:20 +0200 (CEST) Received: from trochilidae.lan (unknown [IPv6:2601:602:8802:504f:3e97:eff:fe92:db3b]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 766415C1507; Wed, 13 Jul 2016 09:22:33 +0200 (CEST) From: Stefan Agner To: u-boot@lists.denx.de Date: Wed, 13 Jul 2016 00:25:41 -0700 Message-Id: <20160713072543.3576-8-stefan@agner.ch> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160713072543.3576-1-stefan@agner.ch> References: <20160713072543.3576-1-stefan@agner.ch> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1468394555; bh=gG6FyDes5xN7yc/AYn1pjthMRbwac7bhS67oMVEeQIc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=rGtWIr8F4sUkBlR9p3j3KW26o38Oq9uwDW2qLy/bKW2SvCttvV+artHfdscjQ8Nsmz5KEZyZmA6QFCMITWjo1PPBaTtwmASUTuOv5ZKqIxDeetrPtc3N1tZxmqQEoETq7/BmucgKhqwjihQHMfvouM6hMjnfexrN7IG5/U7v89o= Cc: Stefan Agner , Marcel Ziswiler , Adrian Alonso , Max Krummenacher , Fabio Estevam Subject: [U-Boot] [PATCH v2 7/9] mx7_common: use Kconfig for ARMv7 non-secure mode X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner 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 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