Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / cpu / arm1176 / Makefile

diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile
index b64edf9d97cbaa6b3cfcaad3d791338e41ff87ec..480e1304891dc69606e358610d553b64edd5309d 100644 (file)
--- a/arch/arm/cpu/arm1176/Makefile
+++ b/arch/arm/cpu/arm1176/Makefile
@@ -11,4 +11,4 @@
 extra-y        = start.o
 obj-y  = cpu.o
 
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_BCM2835) += bcm2835/