Commit 6ac0e82d authored by balrog's avatar balrog
Browse files

Set boot sequence from command line (Dan Kenigsberg).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3497 c046a42c-6fe2-441c-8c8c-71466251a162
parent 926c2d23
...@@ -27,7 +27,7 @@ void DMA_run (void) ...@@ -27,7 +27,7 @@ void DMA_run (void)
/* Board init. */ /* Board init. */
static void an5206_init(int ram_size, int vga_ram_size, int boot_device, static void an5206_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -107,7 +107,7 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level) ...@@ -107,7 +107,7 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level)
} }
static static
void bareetraxfs_init (int ram_size, int vga_ram_size, int boot_device, void bareetraxfs_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -462,8 +462,9 @@ static void icp_control_init(uint32_t base) ...@@ -462,8 +462,9 @@ static void icp_control_init(uint32_t base)
/* Board init. */ /* Board init. */
static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device, static void integratorcp_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
......
...@@ -197,8 +197,9 @@ static void mcf5208_sys_init(qemu_irq *pic) ...@@ -197,8 +197,9 @@ static void mcf5208_sys_init(qemu_irq *pic)
} }
} }
static void mcf5208evb_init(int ram_size, int vga_ram_size, int boot_device, static void mcf5208evb_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
......
...@@ -740,7 +740,7 @@ static void main_cpu_reset(void *opaque) ...@@ -740,7 +740,7 @@ static void main_cpu_reset(void *opaque)
} }
static static
void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, void mips_malta_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -74,7 +74,7 @@ static void main_cpu_reset(void *opaque) ...@@ -74,7 +74,7 @@ static void main_cpu_reset(void *opaque)
} }
static void static void
mips_mipssim_init (int ram_size, int vga_ram_size, int boot_device, mips_mipssim_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -55,7 +55,7 @@ static void main_cpu_reset(void *opaque) ...@@ -55,7 +55,7 @@ static void main_cpu_reset(void *opaque)
} }
static static
void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device, void mips_pica61_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -137,7 +137,7 @@ static void main_cpu_reset(void *opaque) ...@@ -137,7 +137,7 @@ static void main_cpu_reset(void *opaque)
} }
static static
void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -115,8 +115,9 @@ static void palmte_button_event(void *opaque, int keycode) ...@@ -115,8 +115,9 @@ static void palmte_button_event(void *opaque, int keycode)
!(keycode & 0x80)); !(keycode & 0x80));
} }
static void palmte_init(int ram_size, int vga_ram_size, int boot_device, static void palmte_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
......
...@@ -152,8 +152,25 @@ static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd) ...@@ -152,8 +152,25 @@ static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd)
rtc_set_memory(s, info_ofs + 8, sectors); rtc_set_memory(s, info_ofs + 8, sectors);
} }
/* convert boot_device letter to something recognizable by the bios */
static int boot_device2nibble(char boot_device)
{
switch(boot_device) {
case 'a':
case 'b':
return 0x01; /* floppy boot */
case 'c':
return 0x02; /* hard drive boot */
case 'd':
return 0x03; /* CD-ROM boot */
case 'n':
return 0x04; /* Network boot */
}
return 0;
}
/* hd_table must contain 4 block drivers */ /* hd_table must contain 4 block drivers */
static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table) static void cmos_init(int ram_size, const char *boot_device, BlockDriverState **hd_table)
{ {
RTCState *s = rtc_state; RTCState *s = rtc_state;
int val; int val;
...@@ -184,24 +201,12 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table ...@@ -184,24 +201,12 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table
rtc_set_memory(s, 0x34, val); rtc_set_memory(s, 0x34, val);
rtc_set_memory(s, 0x35, val >> 8); rtc_set_memory(s, 0x35, val >> 8);
switch(boot_device) { /* set boot devices, and disable floppy signature check if requested */
case 'a': rtc_set_memory(s, 0x3d,
case 'b': boot_device2nibble(boot_device[1]) << 4 |
rtc_set_memory(s, 0x3d, 0x01); /* floppy boot */ boot_device2nibble(boot_device[0]) );
if (!fd_bootchk) rtc_set_memory(s, 0x38,
rtc_set_memory(s, 0x38, 0x01); /* disable signature check */ boot_device2nibble(boot_device[2]) << 4 | (fd_bootchk ? 0x0 : 0x1));
break;
default:
case 'c':
rtc_set_memory(s, 0x3d, 0x02); /* hard drive boot */
break;
case 'd':
rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */
break;
case 'n':
rtc_set_memory(s, 0x3d, 0x04); /* Network boot */
break;
}
/* floppy type */ /* floppy type */
...@@ -663,7 +668,7 @@ static void pc_init_ne2k_isa(NICInfo *nd, qemu_irq *pic) ...@@ -663,7 +668,7 @@ static void pc_init_ne2k_isa(NICInfo *nd, qemu_irq *pic)
} }
/* PC hardware initialisation */ /* PC hardware initialisation */
static void pc_init1(int ram_size, int vga_ram_size, int boot_device, static void pc_init1(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, int snapshot, DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
...@@ -940,7 +945,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, ...@@ -940,7 +945,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
#endif #endif
} }
static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device, static void pc_init_pci(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
...@@ -954,7 +959,7 @@ static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device, ...@@ -954,7 +959,7 @@ static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device,
initrd_filename, 1); initrd_filename, 1);
} }
static void pc_init_isa(int ram_size, int vga_ram_size, int boot_device, static void pc_init_isa(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, int snapshot,
const char *kernel_filename, const char *kernel_filename,
......
...@@ -171,9 +171,9 @@ static void ref405ep_fpga_init (uint32_t base) ...@@ -171,9 +171,9 @@ static void ref405ep_fpga_init (uint32_t base)
} }
} }
static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device, static void ref405ep_init (int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, const char *boot_device, DisplayState *ds,
int snapshot, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
...@@ -191,6 +191,7 @@ static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -191,6 +191,7 @@ static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device,
target_ulong kernel_base, kernel_size, initrd_base, initrd_size; target_ulong kernel_base, kernel_size, initrd_base, initrd_size;
int linux_boot; int linux_boot;
int fl_idx, fl_sectors, len; int fl_idx, fl_sectors, len;
int ppc_boot_device = boot_device[0];
/* XXX: fix this */ /* XXX: fix this */
ram_bases[0] = 0x00000000; ram_bases[0] = 0x00000000;
...@@ -322,7 +323,7 @@ static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -322,7 +323,7 @@ static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device,
} }
env->gpr[4] = initrd_base; env->gpr[4] = initrd_base;
env->gpr[5] = initrd_size; env->gpr[5] = initrd_size;
boot_device = 'm'; ppc_boot_device = 'm';
if (kernel_cmdline != NULL) { if (kernel_cmdline != NULL) {
len = strlen(kernel_cmdline); len = strlen(kernel_cmdline);
bdloc -= ((len + 255) & ~255); bdloc -= ((len + 255) & ~255);
...@@ -496,9 +497,9 @@ static void taihu_cpld_init (uint32_t base) ...@@ -496,9 +497,9 @@ static void taihu_cpld_init (uint32_t base)
} }
} }
static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device, static void taihu_405ep_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, const char *boot_device, DisplayState *ds,
int snapshot, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
...@@ -513,6 +514,7 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device, ...@@ -513,6 +514,7 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device,
target_ulong kernel_base, kernel_size, initrd_base, initrd_size; target_ulong kernel_base, kernel_size, initrd_base, initrd_size;
int linux_boot; int linux_boot;
int fl_idx, fl_sectors; int fl_idx, fl_sectors;
int ppc_boot_device = boot_device[0];
/* RAM is soldered to the board so the size cannot be changed */ /* RAM is soldered to the board so the size cannot be changed */
ram_bases[0] = 0x00000000; ram_bases[0] = 0x00000000;
...@@ -615,7 +617,7 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device, ...@@ -615,7 +617,7 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device,
initrd_base = 0; initrd_base = 0;
initrd_size = 0; initrd_size = 0;
} }
boot_device = 'm'; ppc_boot_device = 'm';
} else { } else {
kernel_base = 0; kernel_base = 0;
kernel_size = 0; kernel_size = 0;
......
...@@ -48,9 +48,9 @@ static CPUReadMemoryFunc *unin_read[] = { ...@@ -48,9 +48,9 @@ static CPUReadMemoryFunc *unin_read[] = {
}; };
/* PowerPC Mac99 hardware initialisation */ /* PowerPC Mac99 hardware initialisation */
static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device, static void ppc_core99_init (int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, const char *boot_device, DisplayState *ds,
int snapshot, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
...@@ -75,6 +75,7 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -75,6 +75,7 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device,
qemu_irq *dummy_irq; qemu_irq *dummy_irq;
int pic_mem_index, dbdma_mem_index, cuda_mem_index; int pic_mem_index, dbdma_mem_index, cuda_mem_index;
int ide_mem_index[2]; int ide_mem_index[2];
int ppc_boot_device = boot_device[0];
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
...@@ -171,7 +172,7 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -171,7 +172,7 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device,
initrd_base = 0; initrd_base = 0;
initrd_size = 0; initrd_size = 0;
} }
boot_device = 'm'; ppc_boot_device = 'm';
} else { } else {
kernel_base = 0; kernel_base = 0;
kernel_size = 0; kernel_size = 0;
...@@ -285,8 +286,8 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -285,8 +286,8 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, int boot_device,
nvram.read_fn = &m48t59_read; nvram.read_fn = &m48t59_read;
nvram.write_fn = &m48t59_write; nvram.write_fn = &m48t59_write;
#endif #endif
PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "MAC99", ram_size, boot_device, PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "MAC99", ram_size,
kernel_base, kernel_size, ppc_boot_device, kernel_base, kernel_size,
kernel_cmdline, kernel_cmdline,
initrd_base, initrd_size, initrd_base, initrd_size,
/* XXX: need an option to load a NVRAM image */ /* XXX: need an option to load a NVRAM image */
......
...@@ -92,9 +92,9 @@ static int vga_osi_call (CPUState *env) ...@@ -92,9 +92,9 @@ static int vga_osi_call (CPUState *env)
return 1; /* osi_call handled */ return 1; /* osi_call handled */
} }
static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device, static void ppc_heathrow_init (int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, const char *boot_device, DisplayState *ds,
int snapshot, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *initrd_filename,
...@@ -114,6 +114,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -114,6 +114,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device,
int vga_bios_size, bios_size; int vga_bios_size, bios_size;
qemu_irq *dummy_irq; qemu_irq *dummy_irq;
int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index; int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
int ppc_boot_device = boot_device[0];
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
...@@ -208,7 +209,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -208,7 +209,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device,
initrd_base = 0; initrd_base = 0;
initrd_size = 0; initrd_size = 0;
} }
boot_device = 'm'; ppc_boot_device = 'm';
} else { } else {
kernel_base = 0; kernel_base = 0;
kernel_size = 0; kernel_size = 0;
...@@ -289,8 +290,8 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -289,8 +290,8 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size, int boot_device,
nvram.opaque = m48t59; nvram.opaque = m48t59;
nvram.read_fn = &m48t59_read; nvram.read_fn = &m48t59_read;
nvram.write_fn = &m48t59_write; nvram.write_fn = &m48t59_write;
PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "HEATHROW", ram_size, boot_device, PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "HEATHROW", ram_size,
kernel_base, kernel_size, ppc_boot_device, kernel_base, kernel_size,
kernel_cmdline, kernel_cmdline,
initrd_base, initrd_size, initrd_base, initrd_size,
/* XXX: need an option to load a NVRAM image */ /* XXX: need an option to load a NVRAM image */
......
...@@ -521,7 +521,7 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = { ...@@ -521,7 +521,7 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = {
#define NVRAM_SIZE 0x2000 #define NVRAM_SIZE 0x2000
/* PowerPC PREP hardware initialisation */ /* PowerPC PREP hardware initialisation */
static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, static void ppc_prep_init (int ram_size, int vga_ram_size, const char *boot_device,
DisplayState *ds, const char **fd_filename, DisplayState *ds, const char **fd_filename,
int snapshot, const char *kernel_filename, int snapshot, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
...@@ -539,6 +539,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -539,6 +539,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device,
ppc_def_t *def; ppc_def_t *def;
PCIBus *pci_bus; PCIBus *pci_bus;
qemu_irq *i8259; qemu_irq *i8259;
int ppc_boot_device = boot_device[0];
sysctrl = qemu_mallocz(sizeof(sysctrl_t)); sysctrl = qemu_mallocz(sizeof(sysctrl_t));
if (sysctrl == NULL) if (sysctrl == NULL)
...@@ -607,7 +608,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -607,7 +608,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device,
initrd_base = 0; initrd_base = 0;
initrd_size = 0; initrd_size = 0;
} }
boot_device = 'm'; ppc_boot_device = 'm';
} else { } else {
kernel_base = 0; kernel_base = 0;
kernel_size = 0; kernel_size = 0;
...@@ -695,7 +696,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, ...@@ -695,7 +696,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device,
nvram.opaque = m48t59; nvram.opaque = m48t59;
nvram.read_fn = &m48t59_read; nvram.read_fn = &m48t59_read;
nvram.write_fn = &m48t59_write; nvram.write_fn = &m48t59_write;
PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, ppc_boot_device,
kernel_base, kernel_size, kernel_base, kernel_size,
kernel_cmdline, kernel_cmdline,
initrd_base, initrd_size, initrd_base, initrd_size,
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */ #define SDRAM_BASE 0x0c000000 /* Physical location of SDRAM: Area 3 */
#define SDRAM_SIZE 0x04000000 #define SDRAM_SIZE 0x04000000
void r2d_init(int ram_size, int vga_ram_size, int boot_device, static void r2d_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState * ds, const char **fd_filename, int snapshot, DisplayState * ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
/* Board init. */ /* Board init. */
static void realview_init(int ram_size, int vga_ram_size, int boot_device, static void realview_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
......
...@@ -62,7 +62,7 @@ void vga_screen_dump(const char *filename) ...@@ -62,7 +62,7 @@ void vga_screen_dump(const char *filename)
/* XXXXX */ /* XXXXX */
} }
void shix_init(int ram_size, int vga_ram_size, int boot_device, static void shix_init(int ram_size, int vga_ram_size, const char *boot_device,
DisplayState * ds, const char **fd_filename, int snapshot, DisplayState * ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
......
...@@ -1228,8 +1228,9 @@ static void spitz_common_init(int ram_size, int vga_ram_size, ...@@ -1228,8 +1228,9 @@ static void spitz_common_init(int ram_size, int vga_ram_size,
sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE); sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE);
} }
static void spitz_init(int ram_size, int vga_ram_size, int boot_device, static void spitz_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
...@@ -1237,8 +1238,9 @@ static void spitz_init(int ram_size, int vga_ram_size, int boot_device, ...@@ -1237,8 +1238,9 @@ static void spitz_init(int ram_size, int vga_ram_size, int boot_device,
kernel_cmdline, initrd_filename, cpu_model, spitz, 0x2c9); kernel_cmdline, initrd_filename, cpu_model, spitz, 0x2c9);
} }
static void borzoi_init(int ram_size, int vga_ram_size, int boot_device, static void borzoi_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
...@@ -1246,8 +1248,9 @@ static void borzoi_init(int ram_size, int vga_ram_size, int boot_device, ...@@ -1246,8 +1248,9 @@ static void borzoi_init(int ram_size, int vga_ram_size, int boot_device,
kernel_cmdline, initrd_filename, cpu_model, borzoi, 0x33f); kernel_cmdline, initrd_filename, cpu_model, borzoi, 0x33f);
} }
static void akita_init(int ram_size, int vga_ram_size, int boot_device, static void akita_init(int ram_size, int vga_ram_size,
DisplayState *ds, const char **fd_filename, int snapshot, const char *boot_device, DisplayState *ds,
const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
...@@ -1255,8 +1258,9 @@ static void akita_init(int ram_size, int vga_ram_size, int boot_device, ...@@ -1255,8 +1258,9 @@ static void akita_init(int ram_size, int vga_ram_size, int boot_device,
kernel_cmdline, initrd_filename, cpu_model, akita, 0x2e8); kernel_cmdline, initrd_filename, cpu_model, akita, 0x2e8);
} }