aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-04-19 16:32:34 +0100
committerAurelien Jarno <aurelien@aurel32.net>2011-04-20 13:01:04 +0200
commit756ba3b0127fea2bfb538d256c76f19aec126732 (patch)
tree42b3374d4299c79f977767b10b5da6d4e63e46f7 /hw
parentc64b21d519a6ecae12f65625fa60f3035ed88644 (diff)
downloadqemu-756ba3b0127fea2bfb538d256c76f19aec126732.zip
qemu-756ba3b0127fea2bfb538d256c76f19aec126732.tar.gz
qemu-756ba3b0127fea2bfb538d256c76f19aec126732.tar.bz2
hw/arm_boot.c: move initrd load address up to accommodate large kernels
Newer kernels are large enough that they can overlap the address where qemu places the initrd. Move the initrd up so that there is enough space for the kernel again. Unfortunately it's not possible to automatically determine the size of the kernel if it is compressed, so this is the best we can do. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw')
-rw-r--r--hw/arm_boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 41e99d1..bfac982 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -15,7 +15,7 @@
#define KERNEL_ARGS_ADDR 0x100
#define KERNEL_LOAD_ADDR 0x00010000
-#define INITRD_LOAD_ADDR 0x00800000
+#define INITRD_LOAD_ADDR 0x00d00000
/* The worlds second smallest bootloader. Set r0-r2, then jump to kernel. */
static uint32_t bootloader[] = {