[Qemu-devel] [6919] target-sh4: r2d --append option support

[Qemu-devel] [6919] target-sh4: r2d --append option support

[Aurelien Jarno]

Revision: 6919
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6919
Author:   aurel32
Date:     2009-03-28 23:18:47 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
target-sh4: r2d --append option support

Remove qemu_ram_alloc(SDRAM_BASE) and related changes.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/r2d.c

Modified: trunk/hw/r2d.c
===================================================================
--- trunk/hw/r2d.c	2009-03-28 23:14:52 UTC (rev 6918)
+++ trunk/hw/r2d.c	2009-03-28 23:18:47 UTC (rev 6919)
@@ -215,7 +215,6 @@
     }
 
     /* Allocate memory space */
-    qemu_ram_alloc(SDRAM_BASE); /* to adjust the offset */
     sdram_addr = qemu_ram_alloc(SDRAM_SIZE);
     cpu_register_physical_memory(SDRAM_BASE, SDRAM_SIZE, sdram_addr);
     /* Register peripherals */
@@ -250,7 +249,7 @@
           env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000;
           pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline);
       } else {
-          kernel_size = load_image(kernel_filename, SDRAM_BASE);
+          kernel_size = load_image_targphys(kernel_filename, SDRAM_BASE, SDRAM_SIZE);
           env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
       }
 
@@ -265,5 +264,5 @@
     .name = "r2d",
     .desc = "r2d-plus board",
     .init = r2d_init,
-    .ram_require = (SDRAM_BASE + SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
+    .ram_require = (SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
 };