summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-10-29 12:13:23 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-10 21:22:27 +0800
commit422a017e62242970716c211b9b0671a3a15c81fe (patch)
treee897e95fa1418cdd4c667b6c13cc3dc0bb718204
parent570cf02a833ea93a0935b68aa01d49ffb2e2c2ff (diff)
downloadpoky-422a017e62242970716c211b9b0671a3a15c81fe.tar.gz
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>
-rw-r--r--meta/classes/kernel.bbclass4
1 files changed, 3 insertions, 1 deletions
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() {
481 fi 481 fi
482 482
483 if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 483 if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
484 if test -e arch/${ARCH}/boot/compressed/vmlinux ; then 484 if test -e arch/${ARCH}/boot/uImage ; then
485 cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
486 elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
485 ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin 487 ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
486 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 488 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
487 rm -f linux.bin 489 rm -f linux.bin