qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Scott Wood <scottwood@freescale.com>
To: Alexander Graf <agraf@suse.de>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/2] PPC: e500: calculate initrd_base like dt_base
Date: Wed, 22 Aug 2012 19:55:41 -0500	[thread overview]
Message-ID: <1345683341-8236-2-git-send-email-scottwood@freescale.com> (raw)
In-Reply-To: <1345683341-8236-1-git-send-email-scottwood@freescale.com>

While investigating dtb pad issues, I noticed that initrd_base wasn't taking
loadaddr into account the way dt_base was.  This seems wrong.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
 hw/ppc/e500.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 1ccfd7c..60ddd85 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -553,7 +553,8 @@ void ppce500_init(PPCE500Params *params)
 
     /* Load initrd. */
     if (params->initrd_filename) {
-        initrd_base = (kernel_size + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK;
+        initrd_base = (loadaddr + kernel_size + INITRD_LOAD_PAD) &
+            ~INITRD_PAD_MASK;
         initrd_size = load_image_targphys(params->initrd_filename, initrd_base,
                                           ram_size - initrd_base);
 
-- 
1.7.9.5

  reply	other threads:[~2012-08-23  0:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-23  0:55 [Qemu-devel] [PATCH 1/2] PPC: e500: increase DTC_LOAD_PAD Scott Wood
2012-08-23  0:55 ` Scott Wood [this message]
2012-09-25  7:49   ` [Qemu-devel] [PATCH 2/2] PPC: e500: calculate initrd_base like dt_base Alexander Graf
2012-09-28 19:52     ` [Qemu-devel] [Qemu-ppc] " folkert
2012-09-28 20:11       ` Scott Wood
2012-09-29  1:52       ` Alexander Graf
2012-09-25  7:47 ` [Qemu-devel] [PATCH 1/2] PPC: e500: increase DTC_LOAD_PAD Alexander Graf

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=1345683341-8236-2-git-send-email-scottwood@freescale.com \
    --to=scottwood@freescale.com \
    --cc=agraf@suse.de \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@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).