From 422a017e62242970716c211b9b0671a3a15c81fe Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 29 Oct 2010 12:13:23 -0400 Subject: 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 --- meta/classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 4c79a98039..bb76285eba 100644 --- 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 -- cgit v1.2.3-54-g00ecf