From 792b204798453d96b00e0817e8472c19455e92a2 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 6 Sep 2018 11:56:28 +0800 Subject: [PATCH] ARM: Specify aligned address for secure section instead of using attributes In commit a1274cc94a20 ("ARM: Page align secure section only when it is executed in situ"), we used output section attributes (the "ALIGN" keyword after the colon) to specify the alignment requirements. Using the constant "COMMONPAGE" there was recently broken in binutils 2.31 [1]. Binutils maintainer Alan Modra suggested the former method would still work. Since both methods achieve the same result, this patch does just that. This fixes the "reboot after bootm" issue we've been seeing on sunxi when booting non-secure. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=23571 Suggested-by: Alan Modra Signed-off-by: Chen-Yu Tsai Reviewed-by: Tom Rini Acked-by: Jagan Teki --- 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 834dc99554..0eb164d2e6 100644 --- a/arch/arm/cpu/u-boot.lds +++ b/arch/arm/cpu/u-boot.lds @@ -68,11 +68,11 @@ SECTIONS #ifdef CONFIG_ARMV7_NONSEC /* Align the secure section only if we're going to use it in situ */ - .__secure_start : + .__secure_start #ifndef CONFIG_ARMV7_SECURE_BASE ALIGN(CONSTANT(COMMONPAGESIZE)) #endif - { + : { KEEP(*(.__secure_start)) } -- 2.39.5