diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-04-28 17:12:58 -0700 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2014-05-13 09:12:40 +1000 |
| commit | e5bfd64050e81774b6bf71ab5dd064f7bcef0c4c (patch) | |
| tree | 4497a51666e1310bae35c78fe47de5f5fa67f105 /hw/microblaze | |
| parent | 7dfba6dfbf805cf99c4ae89f6194bc9205dfbefe (diff) | |
| download | qemu-e5bfd64050e81774b6bf71ab5dd064f7bcef0c4c.zip | |
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>
Diffstat (limited to 'hw/microblaze')
| -rw-r--r-- | hw/microblaze/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index deeecfca6f..6bf36d046f 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) { |