diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2015-04-21 07:18:24 +0200 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2015-05-13 09:24:13 -0700 |
| commit | 104d6fb6cd064c4c9278e5b6fdf99ac025597753 (patch) | |
| tree | 4f4d0a9b79588fac3b9a778674290975c03bcebe /arch/arm/cpu/armv7/virt-dt.c | |
| parent | 86bd20b007daa32c1c20486ec9927ef6241c84bf (diff) | |
| download | blackbird-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/virt-dt.c')
| -rw-r--r-- | arch/arm/cpu/armv7/virt-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c index 9408e33203..caaaaabccd 100644 --- a/arch/arm/cpu/armv7/virt-dt.c +++ b/arch/arm/cpu/armv7/virt-dt.c @@ -90,7 +90,7 @@ static int fdt_psci(void *fdt) int psci_update_dt(void *fdt) { -#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +#ifdef CONFIG_ARMV7_NONSEC if (!armv7_boot_nonsec()) return 0; #endif |
