1 files changed, 21 insertions, 11 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1782473181..ca1426cd88 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -440,22 +440,32 @@ MODULE_TARBALL_DEPLOY ?= "1"
 do_uboot_mkimage() {
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
                 if test "x${KEEPUIMAGE}" != "xyes" ; then
+                        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+                                vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
+                                linux_suffix=""
+                                linux_comp="none"
+                        else
+                                vmlinux_path="vmlinux"
+                                linux_suffix=".gz"
+                                linux_comp="gzip"
+                        fi
+
+                        ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
+
+                        if [ "${linux_comp}" != "none" ] ; then
+                                rm -f linux.bin
+                                gzip -9 linux.bin
+                                mv -f "linux.bin${linux_suffix}" linux.bin
+                        fi
+
                         ENTRYPOINT=${UBOOT_ENTRYPOINT}
                         if test -n "${UBOOT_ENTRYSYMBOL}"; then
                                 ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
                                         awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
                         fi
-                        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
-                                ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-                                uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
-                                rm -f linux.bin
-                        else
-                                ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-                                rm -f linux.bin.gz
-                                gzip -9 linux.bin
-                                uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
-                                rm -f linux.bin.gz
-                        fi
+
+                        uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+                        rm -f linux.bin
                 fi
         fi
 }