commit d758525180e0efff8a59cfea11f5f8348014ff6a
author pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Apr 10 03:36:49 2009 +0000
committer pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Apr 10 03:36:49 2009 +0000
tree 2a6da1aeb63128e8f2837ba481cec8d1e8fd0a98
parent b584726df971c1238a5249cc21121cf2ebbcaf55

More phys_ram_base elimination.

Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7064 c046a42c-6fe2-441c-8c8c-71466251a162

hw/ppce500_mpc8544ds.c

diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 3d73f8a..868dd90 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -182,7 +182,7 @@
     ram_size &= ~(RAM_SIZES_ALIGN - 1);
 
     /* Register Memory */
-    cpu_register_physical_memory(0, ram_size, 0);
+    cpu_register_physical_memory(0, ram_size, qemu_ram_alloc(ram_size));
 
     /* MPIC */
     irqs = qemu_mallocz(sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);
@@ -247,7 +247,8 @@
 
     /* Load initrd. */
     if (initrd_filename) {
-        initrd_size = load_image(initrd_filename, phys_ram_base + initrd_base);
+        initrd_size = load_image_targphys(initrd_filename, initrd_base,
+                                          ram_size - initrd_base);
 
         if (initrd_size < 0) {
             fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",