summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-08-30 16:22:21 +0900
committerTom Rini <trini@konsulko.com>2016-09-07 08:48:46 -0400
commit5a3aae68c74e029ed29d22999ab6f22687382f2d (patch)
treeac588a6e326fb4677bfdc997c97a4e42212c2c24 /arch/arm
parent55a65e61870970818f677a6ec287363283da2c1d (diff)
downloadu-boot-imx-5a3aae68c74e029ed29d22999ab6f22687382f2d.zip
u-boot-imx-5a3aae68c74e029ed29d22999ab6f22687382f2d.tar.gz
u-boot-imx-5a3aae68c74e029ed29d22999ab6f22687382f2d.tar.bz2
ARM: armv7: guard memory reserve for PSCI with #ifdef CONFIG_ARMV7_PSCI
If CONFIG_ARMV7_NONSEC is enabled, the linker script requires CONFIG_ARMV7_PSCI_NR_CPUS regardless of CONFIG_ARMV7_PSCI. Reviewed-by: Alexander Graf <agraf@suse.de> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/u-boot.lds4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 36c9fd0..0a5fae6 100644
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -83,10 +83,10 @@ SECTIONS
#endif
{
KEEP(*(.__secure_stack_start))
-
+#ifdef CONFIG_ARMV7_PSCI
/* Skip addreses for stack */
. = . + CONFIG_ARMV7_PSCI_NR_CPUS * ARM_PSCI_STACK_SIZE;
-
+#endif
/* Align end of stack section to page boundary */
. = ALIGN(CONSTANT(COMMONPAGESIZE));