From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lnhnd-0005hF-Fi
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:18:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lnhnd-0005gu-1W
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:18:49 -0400
Received: from [199.232.76.173] (port=36400 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lnhnc-0005gr-NF
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:18:48 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40713 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1Lnhnc-00083A-JB
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:18:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1Lnhnb-0006H6-RQ
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 23:18:47 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aurel32@savannah.gnu.org>) id 1Lnhnb-0006H1-Gi
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 23:18:47 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1Lnhnb-0006H1-Gi@cvs.savannah.gnu.org>
Date: Sat, 28 Mar 2009 23:18:47 +0000
Subject: [Qemu-devel] [6919] target-sh4: r2d --append option support
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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,
 };