summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-07-22 16:51:50 +0200
committerOlof Johansson <olof@lixom.net>2019-07-23 19:12:53 +0200
commitd64b212ea960db4276a1d8372bd98cb861dfcbb0 (patch)
tree8f3e70f51f8fa91a79376a10c87c85649ad1a6c6
parentARM: Delete netx a second time (diff)
downloadlinux-d64b212ea960db4276a1d8372bd98cb861dfcbb0.tar.xz
linux-d64b212ea960db4276a1d8372bd98cb861dfcbb0.zip
ARM: davinci: fix sleep.S build error on ARMv4
When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure: arch/arm/mach-davinci/sleep.S: Assembler messages: arch/arm/mach-davinci/sleep.S:56: Error: selected processor does not support `blx ip' in ARM mode Add a .arch statement in the sources to make this file build. Link: https://lore.kernel.org/r/20190722145211.1154785-1-arnd@arndb.de Acked-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-davinci/sleep.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index 05d03f09ff54..71262dcdbca3 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S
@@ -24,6 +24,7 @@
#define DEEPSLEEP_SLEEPENABLE_BIT BIT(31)
.text
+ .arch armv5te
/*
* Move DaVinci into deep sleep state
*