On Sat, Aug 20, 2011 at 12:58 AM, Otavio Salvador
<ota...@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
> ---
> meta/classes/kernel.bbclass | 39 +++++++++++++++++++++++----------------
> 1 files changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index ff3fa46..8a56b85 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -470,6 +470,29 @@ do_sizecheck() {
>
> addtask sizecheck before do_install after do_compile
>
> +do_uboot_mkimage() {
> + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> + ENTRYPOINT=${UBOOT_ENTRYPOINT}
> + if test -n "${UBOOT_ENTRYSYMBOL}"; then
> + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> + awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> + fi
These aren't equivalent. We should maintain what is already in kernel.bbclass
and just move it over. If there already a uImage in the build tree, there's no
need to run all the objcopy "mess" below. I found that it created useless binary
blobs forme in the past.
Bruce
> + if 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 ${UBOOT_ARCH} -O linux -T kernel -C none -a
> ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d
> linux.bin arch/${ARCH}/boot/uImage
> + rm -f linux.bin
> + else
> + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
> + rm -f linux.bin.gz
> + gzip -9 linux.bin
> + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a
> ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d
> linux.bin.gz arch/${ARCH}/boot/uImage
> + rm -f linux.bin.gz
> + fi
> + fi
> +}
> +
> +addtask uboot_mkimage before do_install after do_compile
> +
> KERNEL_IMAGE_BASE_NAME ?=
> "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
> # Don't include the DATETIME variable in the sstate package signatures
> KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> @@ -481,22 +504,6 @@ kernel_do_deploy() {
> tar -cvzf
> ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
> fi
>
> - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> - if test -e arch/${ARCH}/boot/uImage ; then
> - cp arch/${ARCH}/boot/uImage
> ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.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}/${KERNEL_IMAGE_BASE_NAME}.bin
> - rm -f linux.bin
> - else
> - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux
> linux.bin
> - rm -f linux.bin.gz
> - gzip -9 linux.bin
> - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip
> -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n
> "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz
> ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> - rm -f linux.bin.gz
> - fi
> - fi
> -
> cd ${DEPLOYDIR}
> rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
> ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
> --
> 1.7.2.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
