← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to hw/an5206.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/an5206.c
24
24
{
25
25
}
26
26
 
27
 
void DMA_run (void)
28
 
{
29
 
}
30
 
 
31
27
/* Board init.  */
32
28
 
33
 
static void an5206_init(int ram_size, int vga_ram_size,
34
 
                     const char *boot_device, DisplayState *ds,
 
29
static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
 
30
                     const char *boot_device,
35
31
                     const char *kernel_filename, const char *kernel_cmdline,
36
32
                     const char *initrd_filename, const char *cpu_model)
37
33
{
72
68
    kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
73
69
    entry = elf_entry;
74
70
    if (kernel_size < 0) {
75
 
        kernel_size = load_uboot(kernel_filename, &entry, NULL);
 
71
        kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
76
72
    }
77
73
    if (kernel_size < 0) {
78
74
        kernel_size = load_image(kernel_filename,
88
84
}
89
85
 
90
86
QEMUMachine an5206_machine = {
91
 
    "an5206",
92
 
    "Arnewsh 5206",
93
 
    an5206_init,
 
87
    .name = "an5206",
 
88
    .desc = "Arnewsh 5206",
 
89
    .init = an5206_init,
 
90
    .ram_require = 512,
94
91
};