Revision 6ac0e82d hw/ppc405_boards.c
| b/hw/ppc405_boards.c | ||
|---|---|---|
| 171 | 171 |
} |
| 172 | 172 |
} |
| 173 | 173 |
|
| 174 |
static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device,
|
|
| 175 |
DisplayState *ds, const char **fd_filename,
|
|
| 176 |
int snapshot, |
|
| 174 |
static void ref405ep_init (int ram_size, int vga_ram_size, |
|
| 175 |
const char *boot_device, DisplayState *ds,
|
|
| 176 |
const char **fd_filename, int snapshot,
|
|
| 177 | 177 |
const char *kernel_filename, |
| 178 | 178 |
const char *kernel_cmdline, |
| 179 | 179 |
const char *initrd_filename, |
| ... | ... | |
| 191 | 191 |
target_ulong kernel_base, kernel_size, initrd_base, initrd_size; |
| 192 | 192 |
int linux_boot; |
| 193 | 193 |
int fl_idx, fl_sectors, len; |
| 194 |
int ppc_boot_device = boot_device[0]; |
|
| 194 | 195 |
|
| 195 | 196 |
/* XXX: fix this */ |
| 196 | 197 |
ram_bases[0] = 0x00000000; |
| ... | ... | |
| 322 | 323 |
} |
| 323 | 324 |
env->gpr[4] = initrd_base; |
| 324 | 325 |
env->gpr[5] = initrd_size; |
| 325 |
boot_device = 'm'; |
|
| 326 |
ppc_boot_device = 'm';
|
|
| 326 | 327 |
if (kernel_cmdline != NULL) {
|
| 327 | 328 |
len = strlen(kernel_cmdline); |
| 328 | 329 |
bdloc -= ((len + 255) & ~255); |
| ... | ... | |
| 496 | 497 |
} |
| 497 | 498 |
} |
| 498 | 499 |
|
| 499 |
static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device,
|
|
| 500 |
DisplayState *ds, const char **fd_filename,
|
|
| 501 |
int snapshot, |
|
| 500 |
static void taihu_405ep_init(int ram_size, int vga_ram_size, |
|
| 501 |
const char *boot_device, DisplayState *ds,
|
|
| 502 |
const char **fd_filename, int snapshot,
|
|
| 502 | 503 |
const char *kernel_filename, |
| 503 | 504 |
const char *kernel_cmdline, |
| 504 | 505 |
const char *initrd_filename, |
| ... | ... | |
| 513 | 514 |
target_ulong kernel_base, kernel_size, initrd_base, initrd_size; |
| 514 | 515 |
int linux_boot; |
| 515 | 516 |
int fl_idx, fl_sectors; |
| 517 |
int ppc_boot_device = boot_device[0]; |
|
| 516 | 518 |
|
| 517 | 519 |
/* RAM is soldered to the board so the size cannot be changed */ |
| 518 | 520 |
ram_bases[0] = 0x00000000; |
| ... | ... | |
| 615 | 617 |
initrd_base = 0; |
| 616 | 618 |
initrd_size = 0; |
| 617 | 619 |
} |
| 618 |
boot_device = 'm'; |
|
| 620 |
ppc_boot_device = 'm';
|
|
| 619 | 621 |
} else {
|
| 620 | 622 |
kernel_base = 0; |
| 621 | 623 |
kernel_size = 0; |
Also available in: Unified diff