From 104d6fb6cd064c4c9278e5b6fdf99ac025597753 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 21 Apr 2015 07:18:24 +0200 Subject: 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 CC: York Sun CC: Steve Rae CC: Andre Przywara Signed-off-by: Jan Kiszka Tested-by: Alison Wang Signed-off-by: Tom Warren --- board/armltd/vexpress/vexpress_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/armltd') diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index cb2de2f..d3b3b31 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -181,7 +181,7 @@ ulong get_board_rev(void){ return readl((u32 *)SYS_ID); } -#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +#ifdef CONFIG_ARMV7_NONSEC /* Setting the address at which secondary cores start from. * Versatile Express uses one address for all cores, so ignore corenr */ -- cgit v1.1