Revision 1724f049 hw/ppc405_boards.c

b/hw/ppc405_boards.c
190 190
    DriveInfo *dinfo;
191 191

  
192 192
    /* XXX: fix this */
193
    ram_bases[0] = qemu_ram_alloc(0x08000000);
193
    ram_bases[0] = qemu_ram_alloc(NULL, "ef405ep.ram", 0x08000000);
194 194
    ram_sizes[0] = 0x08000000;
195 195
    ram_bases[1] = 0x00000000;
196 196
    ram_sizes[1] = 0x00000000;
......
202 202
                        kernel_filename == NULL ? 0 : 1);
203 203
    /* allocate SRAM */
204 204
    sram_size = 512 * 1024;
205
    sram_offset = qemu_ram_alloc(sram_size);
205
    sram_offset = qemu_ram_alloc(NULL, "ef405ep.sram", sram_size);
206 206
#ifdef DEBUG_BOARD_INIT
207 207
    printf("%s: register SRAM at offset %08lx\n", __func__, sram_offset);
208 208
#endif
......
217 217
    dinfo = drive_get(IF_PFLASH, 0, fl_idx);
218 218
    if (dinfo) {
219 219
        bios_size = bdrv_getlength(dinfo->bdrv);
220
        bios_offset = qemu_ram_alloc(bios_size);
220
        bios_offset = qemu_ram_alloc(NULL, "ef405ep.bios", bios_size);
221 221
        fl_sectors = (bios_size + 65535) >> 16;
222 222
#ifdef DEBUG_BOARD_INIT
223 223
        printf("Register parallel flash %d size " TARGET_FMT_lx
......
236 236
#ifdef DEBUG_BOARD_INIT
237 237
        printf("Load BIOS from file\n");
238 238
#endif
239
        bios_offset = qemu_ram_alloc(BIOS_SIZE);
239
        bios_offset = qemu_ram_alloc(NULL, "ef405ep.bios", BIOS_SIZE);
240 240
        if (bios_name == NULL)
241 241
            bios_name = BIOS_FILENAME;
242 242
        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
......
509 509
    DriveInfo *dinfo;
510 510

  
511 511
    /* RAM is soldered to the board so the size cannot be changed */
512
    ram_bases[0] = qemu_ram_alloc(0x04000000);
512
    ram_bases[0] = qemu_ram_alloc(NULL, "taihu_405ep.ram-0", 0x04000000);
513 513
    ram_sizes[0] = 0x04000000;
514
    ram_bases[1] = qemu_ram_alloc(0x04000000);
514
    ram_bases[1] = qemu_ram_alloc(NULL, "taihu_405ep.ram-1", 0x04000000);
515 515
    ram_sizes[1] = 0x04000000;
516 516
    ram_size = 0x08000000;
517 517
#ifdef DEBUG_BOARD_INIT
......
531 531
        /* XXX: should check that size is 2MB */
532 532
        //        bios_size = 2 * 1024 * 1024;
533 533
        fl_sectors = (bios_size + 65535) >> 16;
534
        bios_offset = qemu_ram_alloc(bios_size);
534
        bios_offset = qemu_ram_alloc(NULL, "taihu_405ep.bios", bios_size);
535 535
#ifdef DEBUG_BOARD_INIT
536 536
        printf("Register parallel flash %d size " TARGET_FMT_lx
537 537
               " at offset %08lx addr " TARGET_FMT_lx " '%s' %d\n",
......
551 551
#endif
552 552
        if (bios_name == NULL)
553 553
            bios_name = BIOS_FILENAME;
554
        bios_offset = qemu_ram_alloc(BIOS_SIZE);
554
        bios_offset = qemu_ram_alloc(NULL, "taihu_405ep.bios", BIOS_SIZE);
555 555
        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
556 556
        if (filename) {
557 557
            bios_size = load_image(filename, qemu_get_ram_ptr(bios_offset));
......
580 580
               fl_idx, bios_size, bios_offset, (target_ulong)0xfc000000,
581 581
               bdrv_get_device_name(dinfo->bdrv));
582 582
#endif
583
        bios_offset = qemu_ram_alloc(bios_size);
583
        bios_offset = qemu_ram_alloc(NULL, "taihu_405ep.flash", bios_size);
584 584
        pflash_cfi02_register(0xfc000000, bios_offset,
585 585
                              dinfo->bdrv, 65536, fl_sectors, 1,
586 586
                              4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,

Also available in: Unified diff