gwj / at91sam9263 · Commits

Commit f3e3aa8cdd139923267a34a474abea4ace60b32f

Authored by aurel32
1 parent 7ab2589c

target-sh4: r2d --append option support 

Remove qemu_ram_alloc(SDRAM_BASE) and related changes.

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

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6919 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
hw/r2d.c
  View file @f3e3aa8
@@ -215,7 +215,6 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size, @@ -215,7 +215,6 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
215 } 215 }
216 216
217 /* Allocate memory space */ 217 /* Allocate memory space */
218 - qemu_ram_alloc(SDRAM_BASE); /* to adjust the offset */  
219 sdram_addr = qemu_ram_alloc(SDRAM_SIZE); 218 sdram_addr = qemu_ram_alloc(SDRAM_SIZE);
220 cpu_register_physical_memory(SDRAM_BASE, SDRAM_SIZE, sdram_addr); 219 cpu_register_physical_memory(SDRAM_BASE, SDRAM_SIZE, sdram_addr);
221 /* Register peripherals */ 220 /* Register peripherals */
@@ -250,7 +249,7 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size, @@ -250,7 +249,7 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
250 env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000; 249 env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000;
251 pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline); 250 pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline);
252 } else { 251 } else {
253 - kernel_size = load_image(kernel_filename, SDRAM_BASE); 252 + kernel_size = load_image_targphys(kernel_filename, SDRAM_BASE, SDRAM_SIZE);
254 env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */ 253 env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
255 } 254 }
256 255
@@ -265,5 +264,5 @@ QEMUMachine r2d_machine = { @@ -265,5 +264,5 @@ QEMUMachine r2d_machine = {
265 .name = "r2d", 264 .name = "r2d",
266 .desc = "r2d-plus board", 265 .desc = "r2d-plus board",
267 .init = r2d_init, 266 .init = r2d_init,
268 - .ram_require = (SDRAM_BASE + SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED, 267 + .ram_require = (SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
269 }; 268 };