[OE-core] [oe-core][PATCHv2 1/2] kernel.bbclass: merge uboot_mkimage improvements from meta-oe
Bruce Ashfield
bruce.ashfield at windriver.com
Thu Mar 29 14:15:09 UTC 2012
On 12-03-29 10:08 AM, Martin Jansa wrote:
> * allows to detect ENTRYPOINT from kernel binary marked with UBOOT_ENTRYSYMBOL
> used e.g. by ben-nanonote
Nice to see the big benefit called out, definitely helps the
casual reader :)
Looks like we've got all the use cases preserved, so I have no objections.
Acked-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Cheers,
Bruce
>
> Signed-off-by: Martin Jansa<Martin.Jansa at gmail.com>
> ---
> meta/classes/kernel.bbclass | 41 +++++++++++++++++++++++++----------------
> 1 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3519e7c..0ae9bed 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -507,28 +507,37 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME
> KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
> KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
>
> +do_uboot_mkimage() {
> + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> + if test ! -e arch/${ARCH}/boot/uImage ; then
> + ENTRYPOINT=${UBOOT_ENTRYPOINT}
> + if test -n "${UBOOT_ENTRYSYMBOL}"; then
> + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> + awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
> + fi
> + 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
> + fi
> +}
> +
> +addtask uboot_mkimage before do_install after do_compile
> +
> kernel_do_deploy() {
> install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
> if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> 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
More information about the Openembedded-core
mailing list