Revision 3023f332 hw/spitz.c

b/hw/spitz.c
908 908
};
909 909

  
910 910
static void spitz_common_init(ram_addr_t ram_size, int vga_ram_size,
911
                DisplayState *ds, const char *kernel_filename,
911
                const char *kernel_filename,
912 912
                const char *kernel_cmdline, const char *initrd_filename,
913 913
                const char *cpu_model, enum spitz_model_e model, int arm_id)
914 914
{
......
924 924
                        SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE);
925 925
        exit(1);
926 926
    }
927
    cpu = pxa270_init(spitz_binfo.ram_size, ds, cpu_model);
927
    cpu = pxa270_init(spitz_binfo.ram_size, cpu_model);
928 928

  
929 929
    sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
930 930

  
......
969 969
}
970 970

  
971 971
static void spitz_init(ram_addr_t ram_size, int vga_ram_size,
972
                const char *boot_device, DisplayState *ds,
972
                const char *boot_device,
973 973
                const char *kernel_filename, const char *kernel_cmdline,
974 974
                const char *initrd_filename, const char *cpu_model)
975 975
{
976
    spitz_common_init(ram_size, vga_ram_size, ds, kernel_filename,
976
    spitz_common_init(ram_size, vga_ram_size, kernel_filename,
977 977
                kernel_cmdline, initrd_filename, cpu_model, spitz, 0x2c9);
978 978
}
979 979

  
980 980
static void borzoi_init(ram_addr_t ram_size, int vga_ram_size,
981
                const char *boot_device, DisplayState *ds,
981
                const char *boot_device,
982 982
                const char *kernel_filename, const char *kernel_cmdline,
983 983
                const char *initrd_filename, const char *cpu_model)
984 984
{
985
    spitz_common_init(ram_size, vga_ram_size, ds, kernel_filename,
985
    spitz_common_init(ram_size, vga_ram_size, kernel_filename,
986 986
                kernel_cmdline, initrd_filename, cpu_model, borzoi, 0x33f);
987 987
}
988 988

  
989 989
static void akita_init(ram_addr_t ram_size, int vga_ram_size,
990
                const char *boot_device, DisplayState *ds,
990
                const char *boot_device,
991 991
                const char *kernel_filename, const char *kernel_cmdline,
992 992
                const char *initrd_filename, const char *cpu_model)
993 993
{
994
    spitz_common_init(ram_size, vga_ram_size, ds, kernel_filename,
994
    spitz_common_init(ram_size, vga_ram_size, kernel_filename,
995 995
                kernel_cmdline, initrd_filename, cpu_model, akita, 0x2e8);
996 996
}
997 997

  
998 998
static void terrier_init(ram_addr_t ram_size, int vga_ram_size,
999
                const char *boot_device, DisplayState *ds,
999
                const char *boot_device,
1000 1000
                const char *kernel_filename, const char *kernel_cmdline,
1001 1001
                const char *initrd_filename, const char *cpu_model)
1002 1002
{
1003
    spitz_common_init(ram_size, vga_ram_size, ds, kernel_filename,
1003
    spitz_common_init(ram_size, vga_ram_size, kernel_filename,
1004 1004
                kernel_cmdline, initrd_filename, cpu_model, terrier, 0x33f);
1005 1005
}
1006 1006

  

Also available in: Unified diff