Revision f93eb9ff hw/palm.c

b/hw/palm.c
183 183
    qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[11]);
184 184
}
185 185

  
186
static struct arm_boot_info palmte_binfo = {
187
    .loader_start = OMAP_EMIFF_BASE,
188
    .ram_size = 0x02000000,
189
    .board_id = 0x331,
190
};
191

  
186 192
static void palmte_init(int ram_size, int vga_ram_size,
187 193
                const char *boot_device, DisplayState *ds,
188 194
                const char *kernel_filename, const char *kernel_cmdline,
......
190 196
{
191 197
    struct omap_mpu_state_s *cpu;
192 198
    int flash_size = 0x00800000;
193
    int sdram_size = 0x02000000;
199
    int sdram_size = palmte_binfo.ram_size;
194 200
    int io;
195 201
    static uint32_t cs0val = 0xffffffff;
196 202
    static uint32_t cs1val = 0x0000e1a0;
......
250 256
    /* Load the kernel.  */
251 257
    if (kernel_filename) {
252 258
        /* Start at bootloader.  */
253
        cpu->env->regs[15] = OMAP_EMIFF_BASE;
259
        cpu->env->regs[15] = palmte_binfo.loader_start;
254 260

  
255
        arm_load_kernel(cpu->env, sdram_size, kernel_filename, kernel_cmdline,
256
                        initrd_filename, 0x331, OMAP_EMIFF_BASE);
261
        palmte_binfo.kernel_filename = kernel_filename;
262
        palmte_binfo.kernel_cmdline = kernel_cmdline;
263
        palmte_binfo.initrd_filename = initrd_filename;
264
        arm_load_kernel(cpu->env, &palmte_binfo);
257 265
    }
258 266

  
259 267
    dpy_resize(ds, 320, 320);

Also available in: Unified diff