diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 20:27:51 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 20:27:51 +0000 |
| commit | f93eb9ff66868df42f8433d16f2dc48a4af2490f (patch) | |
| tree | 37838f60ac8b497ccb4a879dacbde19cde5ef5c4 /hw/versatilepb.c | |
| parent | e22f8f39f3b0856c199ef29ff75749bb201b17bc (diff) | |
Move the excess of arm_load_kernel() parameters into a struct.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4212 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/versatilepb.c')
| -rw-r--r-- | hw/versatilepb.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/versatilepb.c b/hw/versatilepb.c index da6e4ec330..ecc0037af8 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -157,6 +157,8 @@ static qemu_irq *vpb_sic_init(uint32_t base, qemu_irq *parent, int irq) peripherans and expansion busses. For now we emulate a subset of the PB peripherals and just change the board ID. */ +static struct arm_boot_info versatile_binfo; + static void versatile_init(int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdline, @@ -283,8 +285,12 @@ static void versatile_init(int ram_size, int vga_ram_size, /* 0x101f3000 UART2. */ /* 0x101f4000 SSPI. */ - arm_load_kernel(env, ram_size, kernel_filename, kernel_cmdline, - initrd_filename, board_id, 0x0); + versatile_binfo.ram_size = ram_size; + versatile_binfo.kernel_filename = kernel_filename; + versatile_binfo.kernel_cmdline = kernel_cmdline; + versatile_binfo.initrd_filename = initrd_filename; + versatile_binfo.board_id = board_id; + arm_load_kernel(env, &versatile_binfo); } static void vpb_init(int ram_size, int vga_ram_size, |