qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: qemu-devel@nongnu.org
Cc: peter.crosthwaite@xilinx.com, linux@roeck-us.net
Subject: [Qemu-devel] [PATCH v1 5/5] microblaze: boot: Don't hack the elf entry point
Date: Thu,  8 May 2014 11:35:08 +1000	[thread overview]
Message-ID: <1399512908-23925-6-git-send-email-edgar.iglesias@gmail.com> (raw)
In-Reply-To: <1399512908-23925-1-git-send-email-edgar.iglesias@gmail.com>

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

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>
---
 hw/microblaze/boot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index deeecfc..6bf36d0 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) {
-- 
1.8.3.2

      parent reply	other threads:[~2014-05-08  1:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-08  1:35 [Qemu-devel] [PATCH v1 0/5] MicroBlaze queue Edgar E. Iglesias
2014-05-08  1:35 ` [Qemu-devel] [PATCH v1 1/5] microblaze: Support loading of u-boot initrd images Edgar E. Iglesias
2014-05-08  2:33   ` Peter Crosthwaite
2014-05-08  1:35 ` [Qemu-devel] [PATCH v1 2/5] microblaze: Respect the reset vector Edgar E. Iglesias
2014-05-08  2:34   ` Peter Crosthwaite
2014-05-08  1:35 ` [Qemu-devel] [PATCH v1 3/5] xilinx_intc: Fix writes into MER register Edgar E. Iglesias
2014-05-08  2:39   ` Peter Crosthwaite
2014-05-08  1:35 ` [Qemu-devel] [PATCH v1 4/5] xilinx_timer: Fix writes into TCSR register Edgar E. Iglesias
2014-05-08  2:45   ` Peter Crosthwaite
2014-05-08  3:42     ` Edgar E. Iglesias
2014-05-08  1:35 ` Edgar E. Iglesias [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399512908-23925-6-git-send-email-edgar.iglesias@gmail.com \
    --to=edgar.iglesias@gmail.com \
    --cc=linux@roeck-us.net \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).