kernel: prefer the kernel produced uImage

The custom uImage produced by the kernel classes by default
does not universally boot and working with existing uboot
configurations and setups.

This changes the preference to the uImage constructed by
the kbuild processes and falls back to the other techniques
if uImage is requested by the kernel does not produce one.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4c79a98039d014c9f00589366d0eee3a90c5d9a8..bb76285ebacde75ca95006bbf419d1e31aaab135 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -481,7 +481,9 @@ do_deploy() {
        fi
 
        if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-               if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+               if test -e arch/${ARCH}/boot/uImage ; then
+                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+               elif 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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
                        rm -f linux.bin