Revision f93eb9ff hw/spitz.c

b/hw/spitz.c
1180 1180
/* Board init.  */
1181 1181
enum spitz_model_e { spitz, akita, borzoi, terrier };
1182 1182

  
1183
static struct arm_boot_info spitz_binfo = {
1184
    .loader_start = PXA2XX_SDRAM_BASE,
1185
    .ram_size = 0x04000000,
1186
};
1187

  
1183 1188
static void spitz_common_init(int ram_size, int vga_ram_size,
1184 1189
                DisplayState *ds, const char *kernel_filename,
1185 1190
                const char *kernel_cmdline, const char *initrd_filename,
1186 1191
                const char *cpu_model, enum spitz_model_e model, int arm_id)
1187 1192
{
1188
    uint32_t spitz_ram = 0x04000000;
1193
    uint32_t spitz_ram = spitz_binfo.ram_size;
1189 1194
    uint32_t spitz_rom = 0x00800000;
1190 1195
    struct pxa2xx_state_s *cpu;
1191 1196
    struct scoop_info_s *scp;
......
1230 1235
        spitz_microdrive_attach(cpu);
1231 1236

  
1232 1237
    /* Setup initial (reset) machine state */
1233
    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
1238
    cpu->env->regs[15] = spitz_binfo.loader_start;
1234 1239

  
1235
    arm_load_kernel(cpu->env, spitz_ram, kernel_filename, kernel_cmdline,
1236
                    initrd_filename, arm_id, PXA2XX_SDRAM_BASE);
1240
    spitz_binfo.kernel_filename = kernel_filename;
1241
    spitz_binfo.kernel_cmdline = kernel_cmdline;
1242
    spitz_binfo.initrd_filename = initrd_filename;
1243
    spitz_binfo.board_id = arm_id;
1244
    arm_load_kernel(cpu->env, &spitz_binfo);
1237 1245
    sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE);
1238 1246
}
1239 1247

  

Also available in: Unified diff