From mboxrd@z Thu Jan 1 00:00:00 1970 From: Masahiro Yamada Date: Tue, 30 Aug 2016 16:22:21 +0900 Subject: [U-Boot] [PATCH v2 2/4] ARM: armv7: guard memory reserve for PSCI with #ifdef CONFIG_ARMV7_PSCI In-Reply-To: <1472541743-18717-1-git-send-email-yamada.masahiro@socionext.com> References: <1472541743-18717-1-git-send-email-yamada.masahiro@socionext.com> Message-ID: <1472541743-18717-3-git-send-email-yamada.masahiro@socionext.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de If CONFIG_ARMV7_NONSEC is enabled, the linker script requires CONFIG_ARMV7_PSCI_NR_CPUS regardless of CONFIG_ARMV7_PSCI. Signed-off-by: Masahiro Yamada --- Changes in v2: None arch/arm/cpu/u-boot.lds | 4 ++-- 1 file 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)); -- 1.9.1