From e03c22a98cf5deffd0dec2f9ff88a600aa330bc4 Mon Sep 17 00:00:00 2001 From: Lars Munch Date: Sat, 8 May 2010 22:43:35 +0200 Subject: arm: fix arm kernel boot for non zero start addr Booting an arm kernel has been broken a while when booting from non zero start address. This is due to the order of events: board init loads the kernel and sets register 15 to the start address and then qemu_system_reset reset the cpu making register 15 zero again. This patch fixes the usage of the register 15 start address trick in combination with arm_load_kernel. Signed-off-by: Lars Munch Signed-off-by: Aurelien Jarno --- hw/mainstone.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'hw/mainstone.c') diff --git a/hw/mainstone.c b/hw/mainstone.c index a4379e3..54bacfb 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -89,9 +89,6 @@ static void mainstone_common_init(ram_addr_t ram_size, cpu_register_physical_memory(0, MAINSTONE_ROM, qemu_ram_alloc(MAINSTONE_ROM) | IO_MEM_ROM); - /* Setup initial (reset) machine state */ - cpu->env->regs[15] = mainstone_binfo.loader_start; - #ifdef TARGET_WORDS_BIGENDIAN be = 1; #else -- cgit v1.1