summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-21 20:41:21 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-08-21 20:41:21 +0000
commitddb5b9be9b8d4aac130d1f39a8e9b6429e42e77d (patch)
tree1fe3ac4b5d4030f7c91416765d80c8a20bbea745
parent1c9359fb286e025b821eacf01d0bf92e6ae6f13d (diff)
parenteec1fc3ecc7bcf393ec73cd1cd8f1c400039d53e (diff)
merge of '343be32549619f9cdde460a045b0592d3af6ddb0'
and '486b98349c864712c681885da1a19351dd230534'
-rw-r--r--conf/machine/gumstix.conf2
-rw-r--r--packages/linux/linux.inc4
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 5b416fe3f1..9d51cdcead 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -15,6 +15,8 @@ module_autoload_g_ether = "g_ether"
OLDEST_KERNEL = "2.6.15"
+UBOOT_ENTRYPOINT = "a0008000"
+
#Assume people have some gumstix extension boards
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index e4e7a3f1bb..de4b2cc5a8 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -59,6 +59,8 @@ do_install_prepend() {
fi
}
+UBOOT_ENTRYPOINT ?= "20008000"
+
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
@@ -68,7 +70,7 @@ do_deploy() {
${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 20008000 -e 20008000 -n "${DISTRO_NAME} Kernel for ${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_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
rm -f linux.bin.gz
fi
}