summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-10 13:38:08 -0500
committerTom Rini <trini@konsulko.com>2015-11-10 13:38:08 -0500
commitcad04990715f7eaecd45196e84cf10e9e3248dae (patch)
tree269c3c01ad2134c69d7a7d42585baac9f091a837 /Makefile
parent7ff15aca1a5bbfcf2dfbc18ec7b031c482851f69 (diff)
parent5e68ff3949a3eebf62ba639171814f39c8e46a84 (diff)
downloadtalos-obmc-uboot-cad04990715f7eaecd45196e84cf10e9e3248dae.tar.gz
talos-obmc-uboot-cad04990715f7eaecd45196e84cf10e9e3248dae.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b017593536..61050adb13 100644
--- a/Makefile
+++ b/Makefile
@@ -609,6 +609,8 @@ KBUILD_CFLAGS += $(KCFLAGS)
UBOOTINCLUDE := \
-Iinclude \
$(if $(KBUILD_SRC), -I$(srctree)/include) \
+ $(if $(CONFIG_SYS_THUMB_BUILD), $(if $(CONFIG_HAS_THUMB2),, \
+ -I$(srctree)/arch/$(ARCH)/thumb1/include),) \
-I$(srctree)/arch/$(ARCH)/include \
-include $(srctree)/include/linux/kconfig.h
OpenPOWER on IntegriCloud