diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-08-30 16:22:21 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-07 08:48:46 -0400 |
| commit | 5a3aae68c74e029ed29d22999ab6f22687382f2d (patch) | |
| tree | ac588a6e326fb4677bfdc997c97a4e42212c2c24 /arch | |
| parent | 55a65e61870970818f677a6ec287363283da2c1d (diff) | |
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')
| -rw-r--r-- | arch/arm/cpu/u-boot.lds | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds index 36c9fd0bd01..0a5fae6efcc 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)); |