Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request...

[mirror_qemu.git] / hw / arm / mainstone.c

diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 10420170866363d56b9f66c3213ad6d2432161f4..6bc643651bc59038f1e7295a05f959a014798562 100644 (file)
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -124,9 +124,8 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
     /* Setup CPU & memory */
     mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size,
                       machine->cpu_type);
-    memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
+    memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
                            &error_fatal);
-    memory_region_set_readonly(rom, true);
     memory_region_add_subregion(address_space_mem, 0, rom);
 
     /* There are two 32MiB flash devices on the board */