diff mbox

[1/1,arm64,uboot] Resolved compilation issue for arm64 uboot

Message ID 1444664954-64180-1-git-send-email-matthew.weber@rockwellcollins.com
State Superseded
Headers show

Commit Message

Matt Weber Oct. 12, 2015, 3:49 p.m. UTC
From: Ronak Desai <ronak.desai@rockwellcollins.com>

This patch has been added to resolve the compilation issue
of arm64 uboot.

For aarch64 architecture, kernel uses arm64 terminology and thus from
top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
then passed to uboot compilation. But, it causes compilation issue
while including architecture specific Makefile under
arch/$(ARCH)/Makefile as uboot uses top-level system architecture as
arm only.

Signed-off-by: Ronak Desai <ronak.desai@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
 boot/uboot/uboot.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Thomas Petazzoni Oct. 12, 2015, 5:39 p.m. UTC | #1
Dear Matt Weber,

On Mon, 12 Oct 2015 10:49:14 -0500, Matt Weber wrote:

> This patch has been added to resolve the compilation issue
> of arm64 uboot.
> 
> For aarch64 architecture, kernel uses arm64 terminology and thus from
> top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
> then passed to uboot compilation. But, it causes compilation issue
> while including architecture specific Makefile under
> arch/$(ARCH)/Makefile as uboot uses top-level system architecture as
> arm only.

I'm not a native english speaker, but the wording of this sentence
doesn't seem quite right.

The title of the commit should be:

	uboot: <something>

> +# For aarch64 architecture, kernel uses arm64 terminology and thus from
> +# # top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
> +# # then passed to uboot compilation. But, it causes compilation issue
> +# # while including architecture specific Makefile under arch/$(ARCH)/Makefile
> +# # as uboot uses top-level system architecture as arm only.

Double hashes a the beginning of each line -> not good.

Care to fix that up (especially rewording the commit log and comment) ?

Thanks!

Thomas
Matt Weber Oct. 12, 2015, 6:51 p.m. UTC | #2
Thomas,

On Mon, Oct 12, 2015 at 12:39 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Matt Weber,
>
> On Mon, 12 Oct 2015 10:49:14 -0500, Matt Weber wrote:
>
>> This patch has been added to resolve the compilation issue
>> of arm64 uboot.
>>
>> For aarch64 architecture, kernel uses arm64 terminology and thus from
>> top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
>> then passed to uboot compilation. But, it causes compilation issue
>> while including architecture specific Makefile under
>> arch/$(ARCH)/Makefile as uboot uses top-level system architecture as
>> arm only.
>
> I'm not a native english speaker, but the wording of this sentence
> doesn't seem quite right.
>
> The title of the commit should be:
>
>         uboot: <something>
>
>> +# For aarch64 architecture, kernel uses arm64 terminology and thus from
>> +# # top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
>> +# # then passed to uboot compilation. But, it causes compilation issue
>> +# # while including architecture specific Makefile under arch/$(ARCH)/Makefile
>> +# # as uboot uses top-level system architecture as arm only.
>
> Double hashes a the beginning of each line -> not good.
>
> Care to fix that up (especially rewording the commit log and comment) ?
>

Yeah, not a problem.  I should have a new revision out soon.

> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
Matt Weber Oct. 12, 2015, 6:56 p.m. UTC | #3
Thomas,

On Mon, Oct 12, 2015 at 1:51 PM, Matthew Weber
<matthew.weber@rockwellcollins.com> wrote:
> Thomas,
>
> On Mon, Oct 12, 2015 at 12:39 PM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> Dear Matt Weber,
>>
>> On Mon, 12 Oct 2015 10:49:14 -0500, Matt Weber wrote:
>>
>>> This patch has been added to resolve the compilation issue
>>> of arm64 uboot.
>>>
>>> For aarch64 architecture, kernel uses arm64 terminology and thus from
>>> top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
>>> then passed to uboot compilation. But, it causes compilation issue
>>> while including architecture specific Makefile under
>>> arch/$(ARCH)/Makefile as uboot uses top-level system architecture as
>>> arm only.
>>
>> I'm not a native english speaker, but the wording of this sentence
>> doesn't seem quite right.
>>
>> The title of the commit should be:
>>
>>         uboot: <something>
>>
>>> +# For aarch64 architecture, kernel uses arm64 terminology and thus from
>>> +# # top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
>>> +# # then passed to uboot compilation. But, it causes compilation issue
>>> +# # while including architecture specific Makefile under arch/$(ARCH)/Makefile
>>> +# # as uboot uses top-level system architecture as arm only.
>>
>> Double hashes a the beginning of each line -> not good.
>>
>> Care to fix that up (especially rewording the commit log and comment) ?
>>
>
> Yeah, not a problem.  I should have a new revision out soon.

I went ahead and marked this one as superseded.

>
>> Thanks!
>>
>> Thomas
>> --
>> Thomas Petazzoni, CTO, Free Electrons
>> Embedded Linux, Kernel and Android engineering
>> http://free-electrons.com
>
>
>
> --
> Matthew L Weber / Pr Software Engineer
> Airborne Information Systems / Security Systems and Software / Secure Platforms
> MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
> www.rockwellcollins.com
>
> Note: Any Export License Required Information and License Restricted
> Third Party Intellectual Property (TPIP) content must be encrypted and
> sent to matthew.weber@corp.rockwellcollins.com.
diff mbox

Patch

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index fd29cea..21314c1 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -71,7 +71,16 @@  UBOOT_BIN = u-boot.bin
 UBOOT_BIN_IFT = $(UBOOT_BIN).ift
 endif
 
+# For aarch64 architecture, kernel uses arm64 terminology and thus from
+# # top-level Makefile KERNEL_ARCH is modified to arm64 for aarch64 which
+# # then passed to uboot compilation. But, it causes compilation issue
+# # while including architecture specific Makefile under arch/$(ARCH)/Makefile
+# # as uboot uses top-level system architecture as arm only.
+ifeq ($(KERNEL_ARCH),arm64)
+UBOOT_ARCH = arm
+else
 UBOOT_ARCH = $(KERNEL_ARCH)
+endif
 
 UBOOT_MAKE_OPTS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \