ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips_r4k: fix reset 

(broken by 45a50b1668)

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2009-11-15 23:04:20 +01:00
parent d27d06f21f
commit e90e795e8c
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/mips_r4k.c
View File

@ -78,9 +78,9 @@ typedef struct ResetData {
static int64_t load_kernel(void) static int64_t load_kernel(void)
{ {
int64_t entry, kernel_low, kernel_high; int64_t entry, kernel_low, kernel_high;
long kernel_size, initrd_size; long kernel_size, initrd_size, params_size;
ram_addr_t initrd_offset; ram_addr_t initrd_offset;
int ret; uint32_t *params_buf;
int big_endian; int big_endian;
#ifdef TARGET_WORDS_BIGENDIAN #ifdef TARGET_WORDS_BIGENDIAN
@ -125,20 +125,23 @@ static int64_t load_kernel(void)
} }
/* Store command line. */ /* Store command line. */
if (initrd_size > 0) { params_size = 264;
char buf[64]; params_buf = qemu_malloc(params_size);
ret = snprintf(buf, 64, "rd_start=0x" TARGET_FMT_lx " rd_size=%li ",
PHYS_TO_VIRT((uint32_t)initrd_offset), params_buf[0] = tswap32(ram_size);
initrd_size); params_buf[1] = tswap32(0x12345678);
cpu_physical_memory_write((16 << 20) - 256, (void *)buf, 64);
} else { if (initrd_size > 0) {
ret = 0; snprintf((char *)params_buf + 8, 256, "rd_start=0x" TARGET_FMT_lx " rd_size=%li %s",
} PHYS_TO_VIRT((uint32_t)initrd_offset),
pstrcpy_targphys("cmdline", (16 << 20) - 256 + ret, 256, initrd_size, loaderparams.kernel_cmdline);
loaderparams.kernel_cmdline); } else {
snprintf((char *)params_buf + 8, 256, "%s", loaderparams.kernel_cmdline);
}
rom_add_blob_fixed("params", params_buf, params_size,
(16 << 20) - 264);
stl_phys((16 << 20) - 260, 0x12345678);
stl_phys((16 << 20) - 264, ram_size);
return entry; return entry;
} }