diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-04 15:55:30 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-08-25 10:56:33 +0300 |
| commit | c8a50e596c8eeb41bf5718df5bad6be4080f40c7 (patch) | |
| tree | 589bfb006ec42863a518debd4775d88a3abfe185 /hw/musicpal.c | |
| parent | a1807ef2954d3ddbf9a9bca3949bd0c69fd45a0e (diff) | |
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.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/musicpal.c')
| -rw-r--r-- | hw/musicpal.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index 63dd391176..5e74ee7fd7 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1502,6 +1502,7 @@ static void musicpal_init(ram_addr_t ram_size, unsigned long flash_size; DriveInfo *dinfo; ram_addr_t sram_off; + MemoryRegion *flash = g_new(MemoryRegion, 1); if (!cpu_model) { cpu_model = "arm926"; @@ -1565,21 +1566,23 @@ static void musicpal_init(ram_addr_t ram_size, * image is smaller than 32 MB. */ #ifdef TARGET_WORDS_BIGENDIAN - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(NULL, - "musicpal.flash", flash_size), + memory_region_init_rom_device(flash, &pflash_cfi02_ops_be, + NULL, "musicpal.flash", flash_size); + pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, flash, dinfo->bdrv, 0x10000, (flash_size + 0xffff) >> 16, MP_FLASH_SIZE_MAX / flash_size, 2, 0x00BF, 0x236D, 0x0000, 0x0000, - 0x5555, 0x2AAA, 1); + 0x5555, 0x2AAA); #else - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(NULL, - "musicpal.flash", flash_size), + memory_region_init_rom_device(flash, &pflash_cfi02_ops_le, + NULL, "musicpal.flash", flash_size); + pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, flash, dinfo->bdrv, 0x10000, (flash_size + 0xffff) >> 16, MP_FLASH_SIZE_MAX / flash_size, 2, 0x00BF, 0x236D, 0x0000, 0x0000, - 0x5555, 0x2AAA, 0); + 0x5555, 0x2AAA); #endif } |