diff mbox

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

Message ID 1428762568-32088-1-git-send-email-yamada.masahiro@socionext.com
State Superseded
Headers show

Commit Message

Masahiro Yamada April 11, 2015, 2:29 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 patch for commit 79d75d752717 *was* correct when it was posted.
Notice it was written for multi .config configuration where Kconfig
set CONFIG_CPU_V7/CONFIG_CPU_ARM720T for Tegra U-Boot Main/SPL,
respectively.  But, it look long until that patch was merged into
the mainline, and finally, it was overtaken by commit e02ee2548afe
(kconfig: switch to single .config configuration).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reported-by: Stephen Warren <swarren@nvidia.com>
Reported-by: Jan Kiszka <jan.kiszka@web.de>
---

I just did build test for all the Tegra boards.

Stephen,
Could you do run-test?

Tom,
Please hold back the v2015.04 release until we confim
this problem is fixed.


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

Comments

Jan Kiszka April 11, 2015, 3:39 p.m. UTC | #1
On 2015-04-11 16:29, 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 patch for commit 79d75d752717 *was* correct when it was posted.
> Notice it was written for multi .config configuration where Kconfig
> set CONFIG_CPU_V7/CONFIG_CPU_ARM720T for Tegra U-Boot Main/SPL,
> respectively.  But, it look long until that patch was merged into
> the mainline, and finally, it was overtaken by commit e02ee2548afe
> (kconfig: switch to single .config configuration).
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Reported-by: Jan Kiszka <jan.kiszka@web.de>
> ---
> 
> I just did build test for all the Tegra boards.
> 
> Stephen,
> Could you do run-test?
> 
> Tom,
> Please hold back the v2015.04 release until we confim
> this problem is fixed.
> 
> 
>  arch/arm/Makefile | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> 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
> 

Tested-by: Jan Kiszka <jan.kiszka@siemens.com>

Thanks for the quick solution!
Jan
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