Patchwork [U-Boot] arm: make 'MAKEALL -a' distinguish between arm and aarch64

login
register
mail settings
Submitter Albert ARIBAUD
Date Jan. 10, 2014, 9:28 a.m.
Message ID <1389346096-26870-1-git-send-email-albert.u.boot@aribaud.net>
Download mbox | patch
Permalink /patch/309208/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Albert ARIBAUD - Jan. 10, 2014, 9:28 a.m.
The vexpress_aemv8a is the first aarch64 board in U-Boot.
As it was introduced, it gets built when "MAKEALL -a arm"
is invoked, and fails as this command is run with a 32-bit,
not 64-bit, toolchain as the cross-compiler.

Introduce 'arch64' as a valid 'MAKEALL -a' argument, treated
as 'arm' for all other intents, and change the architecture
of the vexpress_aemv8a entry in boards.cfg from 'arm' to
'aarch64'.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
This patch must be applied above the arm64 series and Tom's (amended)
patch re config.h.

It has been tested and verified to:
- correctly exclude vexpress_aemv8a from MAKEALL -a arm
- correctly include only vexpress_aemv8a from MAKEALL -a aarch64
- correctly build vexpress_aemv8a from MAKEALL -a aarch64

 boards.cfg | 3 +--
 mkconfig   | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
Wolfgang Denk - Jan. 10, 2014, 11:49 a.m.
Dear Albert,

In message <1389346096-26870-1-git-send-email-albert.u.boot@aribaud.net> you wrote:
> The vexpress_aemv8a is the first aarch64 board in U-Boot.
> As it was introduced, it gets built when "MAKEALL -a arm"
> is invoked, and fails as this command is run with a 32-bit,
> not 64-bit, toolchain as the cross-compiler.
> 
> Introduce 'arch64' as a valid 'MAKEALL -a' argument, treated

I think this is a typo, and you mean 'aarch64' (double-'a') ?

[This can be fixed when applying the patch, me thinks.]

Best regards,

Wolfgang Denk
Albert ARIBAUD - Jan. 10, 2014, 12:36 p.m.
Hi Wolfgang,

On Fri, 10 Jan 2014 12:49:27 +0100, Wolfgang Denk <wd@denx.de> wrote:

> Dear Albert,
> 
> In message <1389346096-26870-1-git-send-email-albert.u.boot@aribaud.net> you wrote:
> > The vexpress_aemv8a is the first aarch64 board in U-Boot.
> > As it was introduced, it gets built when "MAKEALL -a arm"
> > is invoked, and fails as this command is run with a 32-bit,
> > not 64-bit, toolchain as the cross-compiler.
> > 
> > Introduce 'arch64' as a valid 'MAKEALL -a' argument, treated
> 
> I think this is a typo, and you mean 'aarch64' (double-'a') ?

Correct -- and the typo is not in the patch itself, phew. :)

> [This can be fixed when applying the patch, me thinks.]

Will do. Thanks for catching it.

> Best regards,
> 
> Wolfgang Denk

Amicalement,
Gerhard Sittig - Jan. 10, 2014, 1:37 p.m.
On Fri, Jan 10, 2014 at 10:28 +0100, Albert ARIBAUD wrote:
> 
> The vexpress_aemv8a is the first aarch64 board in U-Boot.
> As it was introduced, it gets built when "MAKEALL -a arm"
> is invoked, and fails as this command is run with a 32-bit,
> not 64-bit, toolchain as the cross-compiler.
> 
> Introduce 'arch64' as a valid 'MAKEALL -a' argument, treated
> as 'arm' for all other intents, and change the architecture
> of the vexpress_aemv8a entry in boards.cfg from 'arm' to
> 'aarch64'.

s/arch64/aarch64/ at the first occurence in this paragraph?

> 
> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> [ ... ]


virtually yours
Gerhard Sittig
Albert ARIBAUD - Jan. 10, 2014, 1:38 p.m.
Hi Albert,

On Fri, 10 Jan 2014 10:28:16 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> The vexpress_aemv8a is the first aarch64 board in U-Boot.
> As it was introduced, it gets built when "MAKEALL -a arm"
> is invoked, and fails as this command is run with a 32-bit,
> not 64-bit, toolchain as the cross-compiler.
> 
> Introduce 'arch64' as a valid 'MAKEALL -a' argument, treated
> as 'arm' for all other intents, and change the architecture
> of the vexpress_aemv8a entry in boards.cfg from 'arm' to
> 'aarch64'.

Applied, with the typo found by Wolfgang fixed, to u-boot-arm/master.

Amicalement,

Patch

diff --git a/boards.cfg b/boards.cfg
index e168590..029553d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -397,7 +397,7 @@  Active  arm         pxa            -           -               vpac270
 Active  arm         pxa            -           icpdas          lp8x4x              lp8x4x                               -                                                                                                                                 Sergey Yanovich <ynvich@gmail.com>
 Active  arm         pxa            -           toradex         -                   colibri_pxa270                       -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
 Active  arm         sa1100         -           -               -                   jornada                              -                                                                                                                                 Kristoffer Ericson <kristoffer.ericson@gmail.com>
-Active  arm         armv8          -           armltd          vexpress64          vexpress_aemv8a                      vexpress_aemv8a:ARM64                                                                                                             David Feng <fenghua@phytium.com.cn>
+Active  aarch64     armv8          -           armltd          vexpress64          vexpress_aemv8a                      vexpress_aemv8a:ARM64                                                                                                             David Feng <fenghua@phytium.com.cn>
 Active  avr32       at32ap         at32ap700x  atmel           -                   atngw100                             -                                                                                                                                 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
 Active  avr32       at32ap         at32ap700x  atmel           -                   atngw100mkii                         -                                                                                                                                 Andreas BieƟmann <andreas.devel@googlemail.com>
 Active  avr32       at32ap         at32ap700x  atmel           atstk1000           atstk1002                            -                                                                                                                                 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
@@ -1242,4 +1242,3 @@  Orphan  powerpc     mpc8xx         -           -               genietv
 Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX                                  -                                                                                                                                 -
 Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX860T                              -                                                                                                                                 -
 Orphan  powerpc     mpc8xx         -           -               nx823               NX823                                -                                                                                                                                 -
-
diff --git a/mkconfig b/mkconfig
index 40db991..b96c81f 100755
--- a/mkconfig
+++ b/mkconfig
@@ -85,6 +85,13 @@  if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then
 	exit 1
 fi
 
+#
+# Test above needed aarch64, now we need arm
+#
+if [ "${arch}" = "aarch64" ]; then
+	arch="arm"
+fi
+
 if [ "$options" ] ; then
 	echo "Configuring for ${BOARD_NAME} - Board: ${CONFIG_NAME}, Options: ${options}"
 else