X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=hw%2Farm-misc.h;h=010acb4cf96a57a336bd9db9068ada7a4a5c8610;hb=22a0e04b9bb5a02e13b3e5cf5ea8abfac5f34120;hp=7914ff1177cb79aa6e18eb247a2490ece60b43ed;hpb=eea589cc221853688084a139c04fce50fc65745e;p=qemu.git

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 7914ff117..010acb4cf 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -21,17 +21,26 @@ 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);
-
-/* armv7m_nvic.c */
-int system_clock_scale;
-qemu_irq *armv7m_nvic_init(CPUState *env);
-
-/* stellaris_enent.c */
-void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq);
+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;
+    target_phys_addr_t smp_loader_start;
+    target_phys_addr_t smp_priv_base;
+    int nb_cpus;
+    int board_id;
+    int (*atag_board)(struct arm_boot_info *info, void *p);
+    /* Used internally by arm_boot.c */
+    int is_linux;
+    target_phys_addr_t initrd_size;
+    target_phys_addr_t entry;
+};
+void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
+
+/* Multiplication factor to convert from system clock ticks to qemu timer
+   ticks.  */
+extern int system_clock_scale;
 
 #endif /* !ARM_MISC_H */
-