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
This commit is contained in:
parent
7ab2589cbb
commit
f3e3aa8cdd
5
hw/r2d.c
5
hw/r2d.c
|
@ -215,7 +215,6 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocate memory space */
|
/* Allocate memory space */
|
||||||
qemu_ram_alloc(SDRAM_BASE); /* to adjust the offset */
|
|
||||||
sdram_addr = qemu_ram_alloc(SDRAM_SIZE);
|
sdram_addr = qemu_ram_alloc(SDRAM_SIZE);
|
||||||
cpu_register_physical_memory(SDRAM_BASE, SDRAM_SIZE, sdram_addr);
|
cpu_register_physical_memory(SDRAM_BASE, SDRAM_SIZE, sdram_addr);
|
||||||
/* Register peripherals */
|
/* Register peripherals */
|
||||||
|
@ -250,7 +249,7 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
|
||||||
env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000;
|
env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000;
|
||||||
pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline);
|
pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline);
|
||||||
} else {
|
} 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 */
|
env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,5 +264,5 @@ QEMUMachine r2d_machine = {
|
||||||
.name = "r2d",
|
.name = "r2d",
|
||||||
.desc = "r2d-plus board",
|
.desc = "r2d-plus board",
|
||||||
.init = r2d_init,
|
.init = r2d_init,
|
||||||
.ram_require = (SDRAM_BASE + SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
|
.ram_require = (SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue