diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2015-04-22 09:45:01 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-04-22 10:47:50 +0300 |
| commit | 072596b2024953c11ea8b4f52672396413e2a486 (patch) | |
| tree | 9f11fdc4df67bfee954877787c37609f83c800a6 | |
| parent | b1c4d6bbbde064ae1e4f271c22a8dd4937fc084b (diff) | |
functions: set UBOOT_ARCH to 'arm' for aarch64
This fixes https://bugs.linaro.org/show_bug.cgi?id=1501 and works around:
$ git show fd8158134f3d7a7c795c818cc50eb2858a6cae06
commit fd8158134f3d7a7c795c818cc50eb2858a6cae06
Author: Nathan Rossi <nathan.rossi@xilinx.com>
Date: Thu Feb 19 13:34:35 2015 +1000
Revert "kernel-arch.bbclass: add arm64 support to U-Boot architecture map"
This reverts commit 0b891265716c414ade29d587fc1a3c4ea7beadbe.
U-Boot does support AArch64, this however was only added to newer
versions of U-Boot and at the time of this original commit the U-Boot in
OE-Core did not support the 'arm64' architecture. OE-Core now has a
newer version of U-Boot for the mkimage recipe and thus supports the
'arm64' architecture.
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index bbcfa15..6a6ad91 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -40,7 +40,6 @@ def map_uboot_arch(a, d):
if re.match('p(pc|owerpc)(|64)', a): return 'ppc'
elif re.match('i.86$', a): return 'x86'
- elif re.match('arm64$', a): return 'arm'
return a
Change-Id: I05568992a00a5e2bafd101fc8981ec3b04501115
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
| -rwxr-xr-x | functions.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/functions.sh b/functions.sh index 034d7a3..89ea701 100755 --- a/functions.sh +++ b/functions.sh @@ -171,6 +171,9 @@ LICENSE_FLAGS_WHITELIST = "non-commercial" # fix openvswitch to avoid problems with latest recipe PREFERRED_VERSION_openvswitch = "2.1.3" +# Work around old u-boots needing 'arm' instead of 'arm64' +UBOOT_ARCH_aarch64 = "arm" + EOF if [[ -d ../poky ]]; then |