mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
pflash_cfi01/pflash_cfi02: convert to memory API
cfi02 is annoying in that is ignores some address bits; we probably want explicit support in the memory API for that. In order to get the correct opaque into the MemoryRegion object, the allocation scheme is changed so that the flash emulation code allocates memory, instead of the caller. This clears a FIXME in the flash code. Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
ccbecf6237
commit
cfe5f01104
18 changed files with 187 additions and 181 deletions
|
@ -82,7 +82,6 @@ milkymist_init(ram_addr_t ram_size_not_used,
|
|||
int kernel_size;
|
||||
DriveInfo *dinfo;
|
||||
ram_addr_t phys_sdram;
|
||||
ram_addr_t phys_flash;
|
||||
qemu_irq irq[32], *cpu_irq;
|
||||
int i;
|
||||
char *bios_filename;
|
||||
|
@ -113,10 +112,9 @@ milkymist_init(ram_addr_t ram_size_not_used,
|
|||
cpu_register_physical_memory(sdram_base, sdram_size,
|
||||
phys_sdram | IO_MEM_RAM);
|
||||
|
||||
phys_flash = qemu_ram_alloc(NULL, "milkymist.flash", flash_size);
|
||||
dinfo = drive_get(IF_PFLASH, 0, 0);
|
||||
/* Numonyx JS28F256J3F105 */
|
||||
pflash_cfi01_register(flash_base, phys_flash,
|
||||
pflash_cfi01_register(flash_base, NULL, "milkymist.flash", flash_size,
|
||||
dinfo ? dinfo->bdrv : NULL, flash_sector_size,
|
||||
flash_size / flash_sector_size, 2,
|
||||
0x00, 0x89, 0x00, 0x1d, 1);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue