From: "Jeremy C. Andrus" <jeremya@xxxxxxxxxxxxxxx> This patch explicitly enables ARM security extensions in sleep.S. This fixes kernel builds with Android provided ARM cross-compilers which do not assume the presence of the security extensions. Signed-off-by: Jeremy C. Andrus <jeremya@xxxxxxxxxxxxxxx> Change-Id: Id079d54ad0cecf9145b9d51aaeebf4e6a22e80a2 Cc: Stephen Warren <swarren@xxxxxxxxxxxxx> Cc: Olof Johansson <olof@xxxxxxxxx> --- arch/arm/mach-tegra/sleep.S | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 18b8799..4e898b8 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -50,6 +50,15 @@ #define TEGRA_CLK_RESET_VIRT (TEGRA_CLK_RESET_BASE - IO_PPSB_PHYS + IO_PPSB_VIRT) /* + * ARM security extensions are required when compiling TRUSTED_FOUNDATIONS code, + * and this explicit arch_extension line fixes the build on compilers where the + * as-instr Makefile function fails. The Android cross-compiler is an example. + */ +#ifdef CONFIG_TRUSTED_FOUNDATIONS +.arch_extension sec +#endif + +/* * tegra_pen_lock * * spinlock implementation with no atomic test-and-set and no coherence -- 1.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
