aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-01-21 07:04:47 -0500
committerArnd Bergmann <arnd@arndb.de>2016-01-21 07:16:17 -0500
commit6551b8c9b76ec3cee1386dbeeab528c019fd732c (patch)
tree5d1a6cb8e883d34512c320e49435328172590613
parent6c54809977de3c9e2ef9e9934a2c6625f7e161e7 (diff)
ARM: realview: fix device tree build
As it happens, two obj-$(CONFIG_FOO) += foo.o variables are above obj-y := core.o, which doesn't work: the += directives need to add something to the build and doesn't work if obj-y is not set first, so move the obj-y to be on top and everything builds nicely again. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-realview/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index 8be6632407d8..dae8d86ef4cc 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -4,10 +4,9 @@
4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
5 -I$(srctree)/arch/arm/plat-versatile/include 5 -I$(srctree)/arch/arm/plat-versatile/include
6 6
7 7obj-y := core.o
8obj-$(CONFIG_REALVIEW_DT) += realview-dt.o 8obj-$(CONFIG_REALVIEW_DT) += realview-dt.o
9obj-$(CONFIG_SMP) += platsmp-dt.o 9obj-$(CONFIG_SMP) += platsmp-dt.o
10obj-y := core.o
11 10
12ifdef CONFIG_ATAGS 11ifdef CONFIG_ATAGS
13obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o 12obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o