summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-02-04 12:13:03 +0000
committerKoen Kooi <koen@openembedded.org>2008-02-04 12:13:03 +0000
commitbac34c58b1a65d5b9e6f3d43e3c8bc7eea4c797c (patch)
treebc0d0927105d4003fb60386380e7215b70dc17e1
parent9689c616200a54b57096d8ec684a0212a40bc05d (diff)
linux.inc: allow u-boot entrypoint to differ from loadadress and make atngw100 use it
-rw-r--r--conf/machine/atngw100.conf4
-rw-r--r--packages/linux/linux.inc5
2 files changed, 7 insertions, 2 deletions
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 21e256b04a..559bd40c75 100644
--- 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 951bf16590..e213a2d3f6 100644
--- 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