From: Scott Wood <scottwood@freescale.com>
Date: Wed, 22 Aug 2012 14:55:41 +0000 (+0000)
Subject: PPC: e500: calculate initrd_base like dt_base
X-Git-Tag: qemu-xen-4.3.0-rc1~365^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7e7ec2d290ca5b1bdd555da9852dc5ee60232fe5;p=qemu-upstream-4.4-testing.git

PPC: e500: calculate initrd_base like dt_base

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>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index fc3fde0b6..feb712e5a 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -540,7 +540,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);