kernel.bbclass: merge uboot_mkimage improvements from meta-oe
* allows to detect ENTRYPOINT from kernel binary marked with UBOOT_ENTRYSYMBOL used e.g. by ben-nanonote (From OE-Core rev: 9ce6bd1d58b4418d3a53be417c18a0e57314462a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7ad49364fd
commit
03d978b1ac
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue