Commit bf71a29c8e611a5c7f18d0572edeae82189dd3a2
Committed by
Tom Rini
Tom Rini
1 parent
4adb46a314
Exists in
v2017.01-smarct4x
and in
37 other branches
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>
Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff
arch/arm/Makefile
| ... | ... | @@ -2,6 +2,11 @@ |
| 2 | 2 | # SPDX-License-Identifier: GPL-2.0+ |
| 3 | 3 | # |
| 4 | 4 | |
| 5 | +ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy) | |
| 6 | +CONFIG_CPU_V7= | |
| 7 | +CONFIG_CPU_ARM720T=y | |
| 8 | +endif | |
| 9 | + | |
| 5 | 10 | # This selects which instruction set is used. |
| 6 | 11 | arch-$(CONFIG_CPU_ARM720T) =-march=armv4 |
| 7 | 12 | arch-$(CONFIG_CPU_ARM920T) =-march=armv4 |