From bf71a29c8e611a5c7f18d0572edeae82189dd3a2 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 12 Apr 2015 00:58:14 +0900 Subject: [PATCH] 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 Reported-by: Stephen Warren Reported-by: Jan Kiszka Tested-by: Jan Kiszka --- arch/arm/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6463c1947c..bd4749c55e 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 -- 2.30.2