summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-23 18:06:40 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-11-10 15:03:48 +0100
commit62e92077a8936e60087d55683538ee386cc673aa (patch)
tree98bf9f9796ab466ad1bff97c7672d5c3159526d3 /arch/arm/mach-orion5x
parentbf104ffa2594e5bf14ef2d5ac2711084c763ef77 (diff)
downloadblackbird-obmc-uboot-62e92077a8936e60087d55683538ee386cc673aa.tar.gz
blackbird-obmc-uboot-62e92077a8936e60087d55683538ee386cc673aa.zip
arm: support Thumb-1 with CONFIG_SYS_THUMB_BUILD
When building a Thumb-1-only target with CONFIG_SYS_THUMB_BUILD, some files fail to build, most of the time because they include mcr instructions, which only exist for Thumb-2. This patch introduces a Kconfig option CONFIG_THUMB2 and uses it to select between Thumb-2 and ARM mode for the aforementioned files. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r--arch/arm/mach-orion5x/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
index 546ebcb52e..33dcad40f2 100644
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -16,3 +16,13 @@ obj-y += timer.o
ifndef CONFIG_SKIP_LOWLEVEL_INIT
obj-y += lowlevel_init.o
endif
+
+# some files can only build in ARM or THUMB2, not THUMB1
+
+ifdef CONFIG_SYS_THUMB_BUILD
+ifndef CONFIG_HAS_THUMB2
+
+CFLAGS_cpu.o := -marm
+
+endif
+endif
OpenPOWER on IntegriCloud