diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 07:25:08 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 07:25:08 (GMT) |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /arch/arm/cpu/tegra20-common/Makefile | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
| download | u-boot-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.tar.xz | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'arch/arm/cpu/tegra20-common/Makefile')
| -rw-r--r-- | arch/arm/cpu/tegra20-common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/tegra20-common/Makefile b/arch/arm/cpu/tegra20-common/Makefile index 32ddbda..0e4b3fc 100644 --- a/arch/arm/cpu/tegra20-common/Makefile +++ b/arch/arm/cpu/tegra20-common/Makefile @@ -9,7 +9,7 @@ # The AVP is ARMv4T architecture so we must use special compiler # flags for any startup files it might use. -CFLAGS_arch/arm/cpu/tegra20-common/warmboot_avp.o += -march=armv4t +CFLAGS_warmboot_avp.o += -march=armv4t obj-y += clock.o funcmux.o pinmux.o obj-$(CONFIG_TEGRA_LP0) += warmboot.o crypto.o warmboot_avp.o |