summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-03-05 08:53:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-03-05 08:53:55 +0100
commitbd5af051ed921539730ff96c8f4d4aee79d75d14 (patch)
treec29ca2bbd72a056e246399094e7a29d39984fe53 /arch
parenta02070f437d80c6f678e5ebe03fe2d9e2a3db642 (diff)
parentbfd96d11a920b2142099581946606ec7bf1fcbb0 (diff)
downloadbarebox-bd5af051ed921539730ff96c8f4d4aee79d75d14.tar.gz
barebox-bd5af051ed921539730ff96c8f4d4aee79d75d14.tar.xz
Merge branch 'for-next/arm-1'
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/at91sam9263ek/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boards/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile
index 7af6fab8e1..66083a239e 100644
--- a/arch/arm/boards/at91sam9263ek/Makefile
+++ b/arch/arm/boards/at91sam9263ek/Makefile
@@ -1,4 +1,6 @@
-obj-$(CONFIG_AT91_BOOTSTRAP) += init.o
+ifeq ($(CONFIG_OFDEVICE),)
+obj-y += init.o
+endif
obj-$(CONFIG_OF_DEVICE) += of_init.o
lwl-y += lowlevel_init.o