diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-10-29 12:13:23 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-10 21:22:27 +0800 |
| commit | 422a017e62242970716c211b9b0671a3a15c81fe (patch) | |
| tree | e897e95fa1418cdd4c667b6c13cc3dc0bb718204 /meta/classes/kernel.bbclass | |
| parent | 570cf02a833ea93a0935b68aa01d49ffb2e2c2ff (diff) | |
| download | openembedded-core-422a017e62242970716c211b9b0671a3a15c81fe.tar.gz openembedded-core-422a017e62242970716c211b9b0671a3a15c81fe.tar.bz2 openembedded-core-422a017e62242970716c211b9b0671a3a15c81fe.tar.xz openembedded-core-422a017e62242970716c211b9b0671a3a15c81fe.zip | |
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>
Diffstat (limited to 'meta/classes/kernel.bbclass')
| -rw-r--r-- | meta/classes/kernel.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 4c79a9803..bb76285eb 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 |