summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/Makefile
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 /arch/arm/cpu/armv7/Makefile
parent86bd20b007daa32c1c20486ec9927ef6241c84bf (diff)
downloadblackbird-obmc-uboot-104d6fb6cd064c4c9278e5b6fdf99ac025597753.tar.gz
blackbird-obmc-uboot-104d6fb6cd064c4c9278e5b6fdf99ac025597753.zip
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 'arch/arm/cpu/armv7/Makefile')
-rw-r--r--arch/arm/cpu/armv7/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index e66c61e8ec..5a76100406 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -18,7 +18,7 @@ obj-y += lowlevel_init.o
endif
endif
-ifneq ($(CONFIG_ARMV7_NONSEC)$(CONFIG_ARMV7_VIRT),)
+ifneq ($(CONFIG_ARMV7_NONSEC),)
obj-y += nonsec_virt.o
obj-y += virt-v7.o
obj-y += virt-dt.o
OpenPOWER on IntegriCloud