[oe-commits] org.oe.dev kernel.bbclass: unbreak uImage generation.

[koen commit]

kernel.bbclass: unbreak uImage generation.

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 62d075b408771c0769ec69b4bb1a3cf378a65ac7
ViewMTN: http://monotone.openembedded.org/revision/info/62d075b408771c0769ec69b4bb1a3cf378a65ac7
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r82c1602b792a636cf784d3d5ee5db44e04b7b32f -r62d075b408771c0769ec69b4bb1a3cf378a65ac7
#
#
#
# patch "classes/kernel.bbclass"
#  from [3d9c1ef4fa8d40322fcc47b667ab1a78c47dcac8]
#    to [aa43796485b85a90de8e92d888cb27492a55b831]
#
============================================================
--- classes/kernel.bbclass	3d9c1ef4fa8d40322fcc47b667ab1a78c47dcac8
+++ classes/kernel.bbclass	aa43796485b85a90de8e92d888cb27492a55b831
@@ -61,6 +61,7 @@ UBOOT_ENTRYPOINT ?= "20008000"
 
 # U-Boot support
 UBOOT_ENTRYPOINT ?= "20008000"
+UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
 
 kernel_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
@@ -472,16 +473,16 @@ do_deploy() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		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 ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+			uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.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 ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+			uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
 			rm -f linux.bin.gz
 		fi
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
 	fi
 
 	cd ${DEPLOY_DIR_IMAGE}