kernel-uboot: support compressed kernel on MIPS

MIPS generates vmlinuz.bin when compression in the kernel build is
enabled, including any necessary objcopy so we can leverage that
and skip our manual invocation of objcopy here. We just have to
put the file into the right place for the rest of the build to
find it.

Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 00bc7682473c2558d72ba42c182f8e3bd445f8af)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 868e97d7a75af741397ae422c999fc4764d4ad8e..87f02654fa5f3f836c3d6f5e556bf29136a6899c 100644 (file)
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -3,13 +3,19 @@ uboot_prep_kimage() {
                vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
                linux_suffix=""
                linux_comp="none"
+       elif [ -e arch/${ARCH}/boot/vmlinuz.bin ]; then
+               rm -f linux.bin
+               cp -l arch/${ARCH}/boot/vmlinuz.bin linux.bin
+               vmlinux_path=""
+               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
+       [ -n "${vmlinux_path}" ] && ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
 
        if [ "${linux_comp}" != "none" ] ; then
                gzip -9 linux.bin