aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2015-11-15 20:55:32 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-16 21:16:37 +0100
commit9a730a92a3691a7c2bafcc6373a96d47e3d687bc (patch)
tree5b86d5dc5076e4fe379df6d6397aeab9fbe08c56 /boot
parent8963207bf6837fb19ff811d87486cf10d790cc38 (diff)
downloadbuildroot-9a730a92a3691a7c2bafcc6373a96d47e3d687bc.tar.gz
buildroot-9a730a92a3691a7c2bafcc6373a96d47e3d687bc.tar.bz2
uboot: fix ARCH for i386 and x86_64
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/uboot/uboot.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 66e728f79d..0e3f808f7e 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -72,9 +72,11 @@ 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.
+# we have to special case it. Similar for i386/x86_64 -> x86
ifeq ($(KERNEL_ARCH),arm64)
UBOOT_ARCH = arm
+else ifneq ($(filter $(KERNEL_ARCH),i386 x86_64),)
+UBOOT_ARCH = x86
else
UBOOT_ARCH = $(KERNEL_ARCH)
endif