summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2015-04-21 07:18:24 +0200
committerTom Warren <twarren@nvidia.com>2015-05-13 09:24:13 -0700
commit104d6fb6cd064c4c9278e5b6fdf99ac025597753 (patch)
tree4f4d0a9b79588fac3b9a778674290975c03bcebe /board/freescale
parent86bd20b007daa32c1c20486ec9927ef6241c84bf (diff)
downloadu-boot-imx-104d6fb6cd064c4c9278e5b6fdf99ac025597753.zip
u-boot-imx-104d6fb6cd064c4c9278e5b6fdf99ac025597753.tar.gz
u-boot-imx-104d6fb6cd064c4c9278e5b6fdf99ac025597753.tar.bz2
ARM: Clean up CONFIG_ARMV7_NONSEC/VIRT/PSCI conditions
CONFIG_ARMV7_VIRT depends on CONFIG_ARMV7_NONSEC, thus doesn't need to be taken into account additionally. CONFIG_ARMV7_PSCI is only set on boards that support CONFIG_ARMV7_NONSEC, and it only works on those. CC: Tang Yuantian <Yuantian.Tang@freescale.com> CC: York Sun <yorksun@freescale.com> CC: Steve Rae <srae@broadcom.com> CC: Andre Przywara <andre.przywara@linaro.org> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Tested-by: Alison Wang <alison.wang@freescale.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/common/arm_sleep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index c06b862..8e8b7fa 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -6,7 +6,7 @@
#include <common.h>
#include <asm/io.h>
-#if !defined(CONFIG_ARMV7_NONSEC) || !defined(CONFIG_ARMV7_VIRT)
+#ifndef CONFIG_ARMV7_NONSEC
#error " Deep sleep needs non-secure mode support. "
#else
#include <asm/secure.h>