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

[u-boot] / arch / arm / mach-tegra / tegra20 / Makefile

diff --git a/arch/arm/mach-tegra/tegra20/Makefile b/arch/arm/mach-tegra/tegra20/Makefile
index fc3fb4ae4ccdb7bf67175102e847216d93825d08..72d82a5218f6a8795fe073e31968b6f11a5b2eb5 100644 (file)
--- a/arch/arm/mach-tegra/tegra20/Makefile
+++ b/arch/arm/mach-tegra/tegra20/Makefile
@@ -6,13 +6,12 @@
 
 ifdef CONFIG_SPL_BUILD
 obj-y  += cpu.o
-else
-obj-$(CONFIG_VIDEO_TEGRA) += display.o
 endif
 
 # The AVP is ARMv4T architecture so we must use special compiler
 # flags for any startup files it might use.
-CFLAGS_warmboot_avp.o += -march=armv4t
+CFLAGS_warmboot_avp.o = -march=armv4t -U__LINUX_ARM_ARCH__ \
+       -D__LINUX_ARM_ARCH__=4
 
 obj-y  += clock.o funcmux.o pinmux.o
 obj-$(CONFIG_TEGRA_LP0) += warmboot.o crypto.o warmboot_avp.o