summaryrefslogtreecommitdiff
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/arm-misc.h
parentCorrectly restore pc after an exception occured in Thumb mode. (diff)
downloadqemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.tar.gz
qemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.tar.bz2
qemu-kvm-f93eb9ff66868df42f8433d16f2dc48a4af2490f.zip
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/arm-misc.h')
-rw-r--r--hw/arm-misc.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 7914ff117..3660772db 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -21,10 +21,17 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
const char *kernel_filename, const char *cpu_model);
/* arm_boot.c */
-
-void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
- const char *kernel_cmdline, const char *initrd_filename,
- int board_id, target_phys_addr_t loader_start);
+struct arm_boot_info {
+ int ram_size;
+ const char *kernel_filename;
+ const char *kernel_cmdline;
+ const char *initrd_filename;
+ target_phys_addr_t loader_start;
+ int nb_cpus;
+ int board_id;
+ int (*atag_board)(struct arm_boot_info *info, void *p);
+};
+void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
/* armv7m_nvic.c */
int system_clock_scale;