From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LnhjX-0003v6-4M for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:14:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LnhjW-0003ud-Js for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:14:34 -0400 Received: from [199.232.76.173] (port=36322 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LnhjW-0003uX-Fg for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:14:34 -0400 Received: from savannah.gnu.org ([199.232.41.3]:53518 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 ) id 1LnhjW-0007ax-92 for qemu-devel@nongnu.org; Sat, 28 Mar 2009 19:14:34 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LnhjV-0005nU-CC for qemu-devel@nongnu.org; Sat, 28 Mar 2009 23:14:33 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LnhjU-0005nL-Uj for qemu-devel@nongnu.org; Sat, 28 Mar 2009 23:14:33 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sat, 28 Mar 2009 23:14:33 +0000 Subject: [Qemu-devel] [6916] target-sh4: r2d --append option support Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6916 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6916 Author: aurel32 Date: 2009-03-28 23:14:32 +0000 (Sat, 28 Mar 2009) Log Message: ----------- target-sh4: r2d --append option support Add linux kernel command line ("--append" option) support. Fix kernel loading address to appropriate position when --append used. Using --kernel but --append case is left untouched for backward compatibility. This also change the host<->SH address mapping for r2d to host addr == phys_ram_base + SH addr. Signed-off-by: Takashi YOSHII Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/r2d.c Modified: trunk/hw/r2d.c =================================================================== --- trunk/hw/r2d.c 2009-03-28 22:22:50 UTC (rev 6915) +++ trunk/hw/r2d.c 2009-03-28 23:14:32 UTC (rev 6916) @@ -37,6 +37,9 @@ #define SM501_VRAM_SIZE 0x800000 +/* CONFIG_BOOT_LINK_OFFSET of Linux kernel */ +#define LINUX_LOAD_OFFSET 0x800000 + #define PA_IRLMSK 0x00 #define PA_POWOFF 0x30 #define PA_VERREG 0x32 @@ -212,6 +215,7 @@ } /* 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 */ @@ -233,20 +237,27 @@ pci_nic_init(pci, &nd_table[i], (i==0)? 2<<3: -1, "rtl8139"); /* Todo: register on board registers */ - { + if (kernel_filename) { int kernel_size; /* initialization which should be done by firmware */ stl_phys(SH7750_BCR1, 1<<3); /* cs3 SDRAM */ stw_phys(SH7750_BCR2, 3<<(3*2)); /* cs3 32bit */ - kernel_size = load_image(kernel_filename, phys_ram_base); + if (kernel_cmdline) { + kernel_size = load_image_targphys(kernel_filename, + SDRAM_BASE + LINUX_LOAD_OFFSET, + SDRAM_SIZE - LINUX_LOAD_OFFSET); + 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); + env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */ + } if (kernel_size < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); exit(1); } - - env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */ } } @@ -254,5 +265,5 @@ .name = "r2d", .desc = "r2d-plus board", .init = r2d_init, - .ram_require = (SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED, + .ram_require = (SDRAM_BASE + SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED, };