summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-04-12 00:58:14 +0900
committerTom Rini <trini@konsulko.com>2015-04-11 12:04:30 -0400
commitbf71a29c8e611a5c7f18d0572edeae82189dd3a2 (patch)
tree2b217e8b10fb4012aee69039ef34dbe5c5824b08 /arch
parent4adb46a3144248b2d8b8a68684bee648815c4ada (diff)
downloadu-boot-imx-bf71a29c8e611a5c7f18d0572edeae82189dd3a2.zip
u-boot-imx-bf71a29c8e611a5c7f18d0572edeae82189dd3a2.tar.gz
u-boot-imx-bf71a29c8e611a5c7f18d0572edeae82189dd3a2.tar.bz2
ARM: fix arch/arm/Makefile for Tegra
Since commit 79d75d752717 (ARM: move -march=* and -mtune= options to arch/arm/Makefile), all the Tegra boards are broken because the SPL is built for ARMv7. Insert Tegra-specific code to arch/arm/Makefile to set compiler flags for an earlier ARM architecture. Note: The v1 patch for commit 79d75d752717 *was* correct when it was submitted. Notice it was originally written for multi .config configuration where Kconfig set CONFIG_CPU_V7/CONFIG_CPU_ARM720T for Tegra U-Boot Main/SPL, respectively. But, until it was merged into the mainline, commit e02ee2548afe (kconfig: switch to single .config configuration) had been already applied there. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reported-by: Stephen Warren <swarren@nvidia.com> Reported-by: Jan Kiszka <jan.kiszka@siemens.com> Tested-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6463c19..bd4749c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -2,6 +2,11 @@
# SPDX-License-Identifier: GPL-2.0+
#
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+CONFIG_CPU_V7=
+CONFIG_CPU_ARM720T=y
+endif
+
# This selects which instruction set is used.
arch-$(CONFIG_CPU_ARM720T) =-march=armv4
arch-$(CONFIG_CPU_ARM920T) =-march=armv4