1 files changed, 6 insertions, 4 deletions

diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
index 543f5432ba..2a187f5492 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -1,8 +1,7 @@
 inherit kernel-uboot
 
 python __anonymous () {
-    kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
-    if kerneltype == 'uImage':
+    if "uImage" in (d.getVar('KERNEL_IMAGETYPES', True) or "").split():
         depends = d.getVar("DEPENDS", True)
         depends = "%s u-boot-mkimage-native" % depends
         d.setVar("DEPENDS", depends)
@@ -13,11 +12,14 @@ python __anonymous () {
         # KEEPUIMAGE == yes. Otherwise, we pack compressed vmlinux into
         # the uImage .
         if d.getVar("KEEPUIMAGE", True) != 'yes':
-            d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", "vmlinux")
+            typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", True) or ""
+            if "uImage" in typeformake.split():
+                typeformake.replace('uImage', 'vmlinux')
+            d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
 }
 
 do_uboot_mkimage() {
-        if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
+        if echo "${KERNEL_IMAGETYPES}" | grep -wq "uImage"; then
                 if test "x${KEEPUIMAGE}" != "xyes" ; then
                         uboot_prep_kimage