summaryrefslogtreecommitdiff
path: root/hw/realview.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 20:27:51 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-04-14 20:27:51 +0000
commitf93eb9ff66868df42f8433d16f2dc48a4af2490f (patch)
tree37838f60ac8b497ccb4a879dacbde19cde5ef5c4 /hw/realview.c
parente22f8f39f3b0856c199ef29ff75749bb201b17bc (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/realview.c')
-rw-r--r--hw/realview.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/hw/realview.c b/hw/realview.c
index 29579d87b..acf3b9ee0 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -18,6 +18,11 @@
/* Board init. */
+static struct arm_boot_info realview_binfo = {
+ .loader_start = 0x0,
+ .board_id = 0x33b,
+};
+
static void realview_init(int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename, const char *kernel_cmdline,
@@ -177,8 +182,12 @@ static void realview_init(int ram_size, int vga_ram_size,
/* 0x68000000 PCI mem 1. */
/* 0x6c000000 PCI mem 2. */
- arm_load_kernel(first_cpu, ram_size, kernel_filename, kernel_cmdline,
- initrd_filename, 0x33b, 0x0);
+ realview_binfo.ram_size = ram_size;
+ realview_binfo.kernel_filename = kernel_filename;
+ realview_binfo.kernel_cmdline = kernel_cmdline;
+ realview_binfo.initrd_filename = initrd_filename;
+ realview_binfo.nb_cpus = ncpu;
+ arm_load_kernel(first_cpu, &realview_binfo);
/* ??? Hack to map an additional page of ram for the secondary CPU
startup code. I guess this works on real hardware because the