[gnome-continuous-yocto/gnomeostree-3.28-rocko: 60/218] kernel-fitimage: Fix bad image type replacement for aarch64

[Emmanuele Bassi <ebassi src gnome org>]

commit 70422d7d1174cb7e70b40602878e3e4bbe733f79
Author: Thomas Perrot <thomas perrot tupi fr>
Date:   Wed Dec 13 10:26:38 2017 -0800

    kernel-fitimage: Fix bad image type replacement for aarch64
    
    When using kernel-fitimage class with aarch64, the image type has to be
    Image not zImage.  This patch fixes the bad image type replacement for
    aarch64
    
    (From OE-Core rev: 88f2f2364b615e2510b4378f3cffa5f8df282da6)
    
    Signed-off-by: Thomas Perrot <thomas perrot tupi fr>
    Signed-off-by: Manjukumar Matha <manjukumar harthikote-matha xilinx com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit d14adead5861007ac7e95c32396491f907ab9f8f)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-fitimage.bbclass |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 179185b..9baf399 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,9 +7,12 @@ python __anonymous () {
         depends = "%s u-boot-mkimage-native dtc-native" % depends
         d.setVar("DEPENDS", depends)
 
-        if d.getVar("UBOOT_ARCH") == "mips":
+        uarch = d.getVar("UBOOT_ARCH")
+        if uarch == "arm64":
+            replacementtype = "Image"
+        elif uarch == "mips":
             replacementtype = "vmlinuz.bin"
-        elif d.getVar("UBOOT_ARCH") == "x86":
+        elif uarch == "x86":
             replacementtype = "bzImage"
         else:
             replacementtype = "zImage"