Revision 7fb4fdcf hw/spitz.c

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

  
1183
#define SPITZ_RAM	0x04000000
1184
#define SPITZ_ROM	0x00800000
1185

  
1183 1186
static struct arm_boot_info spitz_binfo = {
1184 1187
    .loader_start = PXA2XX_SDRAM_BASE,
1185 1188
    .ram_size = 0x04000000,
......
1190 1193
                const char *kernel_cmdline, const char *initrd_filename,
1191 1194
                const char *cpu_model, enum spitz_model_e model, int arm_id)
1192 1195
{
1193
    uint32_t spitz_ram = spitz_binfo.ram_size;
1194
    uint32_t spitz_rom = 0x00800000;
1195 1196
    struct pxa2xx_state_s *cpu;
1196 1197
    struct scoop_info_s *scp;
1197 1198

  
......
1199 1200
        cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0";
1200 1201

  
1201 1202
    /* Setup CPU & memory */
1202
    if (ram_size < spitz_ram + spitz_rom + PXA2XX_INTERNAL_SIZE) {
1203
    if (ram_size < SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE) {
1203 1204
        fprintf(stderr, "This platform requires %i bytes of memory\n",
1204
                        spitz_ram + spitz_rom + PXA2XX_INTERNAL_SIZE);
1205
                        SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE);
1205 1206
        exit(1);
1206 1207
    }
1207
    cpu = pxa270_init(spitz_ram, ds, cpu_model);
1208
    cpu = pxa270_init(spitz_binfo.ram_size, ds, cpu_model);
1208 1209

  
1209 1210
    sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
1210 1211

  
1211
    cpu_register_physical_memory(0, spitz_rom,
1212
                    qemu_ram_alloc(spitz_rom) | IO_MEM_ROM);
1212
    cpu_register_physical_memory(0, SPITZ_ROM,
1213
                    qemu_ram_alloc(SPITZ_ROM) | IO_MEM_ROM);
1213 1214

  
1214 1215
    /* Setup peripherals */
1215 1216
    spitz_keyboard_register(cpu);
......
1285 1286
    "akita",
1286 1287
    "Akita PDA (PXA270)",
1287 1288
    akita_init,
1289
    SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1288 1290
};
1289 1291

  
1290 1292
QEMUMachine spitzpda_machine = {
1291 1293
    "spitz",
1292 1294
    "Spitz PDA (PXA270)",
1293 1295
    spitz_init,
1296
    SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1294 1297
};
1295 1298

  
1296 1299
QEMUMachine borzoipda_machine = {
1297 1300
    "borzoi",
1298 1301
    "Borzoi PDA (PXA270)",
1299 1302
    borzoi_init,
1303
    SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1300 1304
};
1301 1305

  
1302 1306
QEMUMachine terrierpda_machine = {
1303 1307
    "terrier",
1304 1308
    "Terrier PDA (PXA270)",
1305 1309
    terrier_init,
1310
    SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1306 1311
};

Also available in: Unified diff