[oe-commits] org.oe.dev linux.inc: allow u-boot entrypoint to differ from loadadress and make atngw100 use it

[koen commit]

linux.inc: allow u-boot entrypoint to differ from loadadress and make atngw100 use it

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2762975d0fd97316a18c454402945cce04b7ad7a
ViewMTN: http://monotone.openembedded.org/revision/info/2762975d0fd97316a18c454402945cce04b7ad7a
Files:
1
conf/machine/atngw100.conf
packages/linux/linux.inc
Diffs:

#
# mt diff -r038835a3488b91319ff1b921e9d93f67b809c7ae -r2762975d0fd97316a18c454402945cce04b7ad7a
#
# 
# 
# patch "conf/machine/atngw100.conf"
#  from [3be4e9a4b5ba7595209dd7a081329f095488a40d]
#    to [f8e16fd82334ed6e47de584e2bcbfbec63360ec3]
# 
# patch "packages/linux/linux.inc"
#  from [98db8927eecd663bea8e02932c23ae03df5ce28a]
#    to [842044ba3ce2c6e2833cece5e5b577864f966d55]
# 
============================================================
--- conf/machine/atngw100.conf	3be4e9a4b5ba7595209dd7a081329f095488a40d
+++ conf/machine/atngw100.conf	f8e16fd82334ed6e47de584e2bcbfbec63360ec3
@@ -22,3 +22,7 @@ KERNEL_IMAGETYPE = "uImage"
 PREFERRED_VERSION_u-boot = "1.1.4"
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_ENTRYPOINT = "0x90000000"
+UBOOT_LOADADRESS = "0x10000000"
+
+
============================================================
--- packages/linux/linux.inc	98db8927eecd663bea8e02932c23ae03df5ce28a
+++ packages/linux/linux.inc	842044ba3ce2c6e2833cece5e5b577864f966d55
@@ -106,6 +106,7 @@ UBOOT_ENTRYPOINT ?= "20008000"
 
 
 UBOOT_ENTRYPOINT ?= "20008000"
+UBOOT_LOADADRESS ?= "${UBOOT_ENTRYPOINT}"
 
 do_compile_append() {
     if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
@@ -116,13 +117,13 @@ do_compile_append() {
 	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_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADRESS} -e ${UBOOT_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_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
             rm -f linux.bin.gz
         fi
     fi