From patchwork Thu Oct 4 13:56:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [32/34] PPC: e500: calculate initrd_base like dt_base Date: Thu, 04 Oct 2012 03:56:54 -0000 From: Alexander Graf X-Patchwork-Id: 189174 Message-Id: <1349359016-13107-33-git-send-email-agraf@suse.de> To: qemu-devel qemu-devel Cc: Blue Swirl , Scott Wood , "qemu-ppc@nongnu.org List" , Aurelien Jarno From: Scott Wood 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 Signed-off-by: Alexander Graf --- hw/ppc/e500.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index fc3fde0..feb712e 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);