From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Date: Tue, 29 Apr 2014 00:12:58 +0000 (-0700)
Subject: microblaze: boot: Don't hack the elf entry point
X-Git-Tag: v2.1.0-rc0~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5bfd64050e81774b6bf71ab5dd064f7bcef0c4c;p=thirdparty%2Fqemu.git

microblaze: boot: Don't hack the elf entry point

There was some modulo logic to ensure that Microblaze always booted into
physical RAM regardless of the elf entry. Removed it, as QEMU should fail
gracefully when given a bad elf, rather than attempt to run it.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index deeecfca6ff..6bf36d046fd 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -148,7 +148,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
                                    big_endian, ELF_MACHINE, 0);
         }
         /* Always boot into physical ram.  */
-        boot_info.bootstrap_pc = ddr_base + (entry & 0x0fffffff);
+        boot_info.bootstrap_pc = (uint32_t)entry;
 
         /* If it wasn't an ELF image, try an u-boot image.  */
         if (kernel_size < 0) {