ARM: armv7: guard memory reserve for PSCI with #ifdef CONFIG_ARMV7_PSCI
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 30 Aug 2016 07:22:21 +0000 (16:22 +0900)
committerTom Rini <trini@konsulko.com>
Wed, 7 Sep 2016 12:48:46 +0000 (08:48 -0400)
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>
arch/arm/cpu/u-boot.lds

index 36c9fd0bd01f36737ed60b3b33d239b7cb860610..0a5fae6efccfbe46d3477cfbff15fd72c97782d7 100644 (file)
@@ -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));