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

diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 21e256b..559bd40 100644 (file)
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -22,3 +22,7 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 PREFERRED_VERSION_u-boot = "1.1.4"
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_ENTRYPOINT = "0x90000000"
+UBOOT_LOADADRESS = "0x10000000"
+
+

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 951bf16..e213a2d 100644 (file)
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -106,6 +106,7 @@ do_configure_append_avr32() {
 
 
 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