diff mbox

[U-Boot,v2] ARM: fix arch/arm/Makefile for Tegra

Message ID 1428767894-5322-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada April 11, 2015, 3:58 p.m. UTC 
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>
---

Changes in v2:
  - Brush up the commit-description because V1 had a typo (s/look/took/)
  - Add Jan's Tested-by credit

 arch/arm/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Tom Rini April 11, 2015, 4:05 p.m. UTC | #1 
On Sun, Apr 12, 2015 at 12:58:14AM +0900, Masahiro Yamada wrote:

> 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>

Applied to u-boot/master, thanks!
Stephen Warren April 12, 2015, 3:39 a.m. UTC | #2 
On 04/11/2015 09:58 AM, Masahiro Yamada wrote:
> 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.

Tested-by: Stephen Warren <swarren@wwwdotorg.org>
diff mbox

Patch

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