aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-01-13 18:37:10 +0300
committerAurelien Jarno <aurelien@aurel32.net>2011-01-20 12:37:21 +0100
commitf75d216a80977da3435f507fa6bae0821a5d9076 (patch)
tree38c5d9892f853fa18ddf635fb496753dd69f18bc
parent2a3c633c1eb8692716220195b6d3fe78b7e411d0 (diff)
downloadqemu-f75d216a80977da3435f507fa6bae0821a5d9076.zip
qemu-f75d216a80977da3435f507fa6bae0821a5d9076.tar.gz
qemu-f75d216a80977da3435f507fa6bae0821a5d9076.tar.bz2
mainstone: fix name of the allocated memory for roms
Mainstone board has two flash chips (emulated by two ram regions), however currently code tries to allocate them with the same name, which fails. Fix that to make mainstone emulation work again. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--hw/mainstone.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c
index efa2959..58e3f86 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -106,7 +106,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
}
if (!pflash_cfi01_register(mainstone_flash_base[i],
- qemu_ram_alloc(NULL, "mainstone.flash",
+ qemu_ram_alloc(NULL, i ? "mainstone.flash1" :
+ "mainstone.flash0",
MAINSTONE_FLASH),
dinfo->bdrv, sector_len,
MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0,