Revision 7f0f7740

b/hw/exynos4_boards.c
93 93
    }
94 94
}
95 95

  
96
static Exynos4210State *exynos4_boards_init_common(
97
        const char *kernel_filename,
98
        const char *kernel_cmdline,
99
        const char *initrd_filename,
100
        Exynos4BoardType board_type)
96
static Exynos4210State *exynos4_boards_init_common(QEMUMachineInitArgs *args,
97
                                                   Exynos4BoardType board_type)
101 98
{
102 99
    if (smp_cpus != EXYNOS4210_NCPUS) {
103 100
        fprintf(stderr, "%s board supports only %d CPU cores. Ignoring smp_cpus"
......
110 107
    exynos4_board_binfo.board_id = exynos4_board_id[board_type];
111 108
    exynos4_board_binfo.smp_bootreg_addr =
112 109
            exynos4_board_smp_bootreg_addr[board_type];
113
    exynos4_board_binfo.kernel_filename = kernel_filename;
114
    exynos4_board_binfo.initrd_filename = initrd_filename;
115
    exynos4_board_binfo.kernel_cmdline = kernel_cmdline;
110
    exynos4_board_binfo.kernel_filename = args->kernel_filename;
111
    exynos4_board_binfo.initrd_filename = args->initrd_filename;
112
    exynos4_board_binfo.kernel_cmdline = args->kernel_cmdline;
116 113
    exynos4_board_binfo.gic_cpu_if_addr =
117 114
            EXYNOS4210_SMP_PRIVATE_BASE_ADDR + 0x100;
118 115

  
......
122 119
            " initrd_filename: %s\n",
123 120
            exynos4_board_ram_size[board_type] / 1048576,
124 121
            exynos4_board_ram_size[board_type],
125
            kernel_filename,
126
            kernel_cmdline,
127
            initrd_filename);
122
            args->kernel_filename,
123
            args->kernel_cmdline,
124
            args->initrd_filename);
128 125

  
129 126
    return exynos4210_init(get_system_memory(),
130 127
            exynos4_board_ram_size[board_type]);
......
132 129

  
133 130
static void nuri_init(QEMUMachineInitArgs *args)
134 131
{
135
    const char *kernel_filename = args->kernel_filename;
136
    const char *kernel_cmdline = args->kernel_cmdline;
137
    const char *initrd_filename = args->initrd_filename;
138
    exynos4_boards_init_common(kernel_filename, kernel_cmdline,
139
                initrd_filename, EXYNOS4_BOARD_NURI);
132
    exynos4_boards_init_common(args, EXYNOS4_BOARD_NURI);
140 133

  
141 134
    arm_load_kernel(arm_env_get_cpu(first_cpu), &exynos4_board_binfo);
142 135
}
143 136

  
144 137
static void smdkc210_init(QEMUMachineInitArgs *args)
145 138
{
146
    const char *kernel_filename = args->kernel_filename;
147
    const char *kernel_cmdline = args->kernel_cmdline;
148
    const char *initrd_filename = args->initrd_filename;
149
    Exynos4210State *s = exynos4_boards_init_common(kernel_filename,
150
            kernel_cmdline, initrd_filename, EXYNOS4_BOARD_SMDKC210);
139
    Exynos4210State *s = exynos4_boards_init_common(args,
140
                                                    EXYNOS4_BOARD_SMDKC210);
151 141

  
152 142
    lan9215_init(SMDK_LAN9118_BASE_ADDR,
153 143
            qemu_irq_invert(s->irq_table[exynos4210_get_irq(37, 1)]));

Also available in: Unified diff