From: Arnout Vandecappelle <arnout@mind.be>
Date: Sun, 15 Nov 2015 19:55:32 +0000 (+0100)
Subject: uboot: fix ARCH for i386 and x86_64
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a730a92a3691a7c2bafcc6373a96d47e3d687bc;p=buildroot.git

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>
---

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