From 4730df02cf236eefeaf00bec197e398ad12cfeaa Mon Sep 17 00:00:00 2001 From: Ronak Desai Date: Mon, 12 Oct 2015 13:53:16 -0500 Subject: [PATCH] uboot: arm64 arch build support For a 64bit arm architecture, Buildroot uses arm64 terminology and from the top-level Makefile KERNEL_ARCH is set to arm64 which is then passed to the uboot build. This causes a compilation issue as uboot uses the top-level system architecture as it's $(ARCH). So arch/$(ARCH)/Makefile doesn't work with arm64 unless we adjust the arch. [Thomas: - rewrap commit message text. - simplify comment in the code.] Signed-off-by: Ronak Desai Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index eee0dba23b..66e728f79d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -71,7 +71,13 @@ UBOOT_BIN = u-boot.bin UBOOT_BIN_IFT = $(UBOOT_BIN).ift endif +# The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so +# we have to special case it. +ifeq ($(KERNEL_ARCH),arm64) +UBOOT_ARCH = arm +else UBOOT_ARCH = $(KERNEL_ARCH) +endif UBOOT_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ -- 2.30.2