summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-07-29 07:00:29 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-07-29 07:48:09 +0200
commitf05d4d94d6bb0e240e6cfda65972fd86601f9f0d (patch)
tree117870a6132bf07c1abca558d2a34263f50fcdaf
parentb0932e0617c65ae1cb0362416ec0ef32766abf5d (diff)
downloadfocaccia-qemu-f05d4d94d6bb0e240e6cfda65972fd86601f9f0d.tar.gz
focaccia-qemu-f05d4d94d6bb0e240e6cfda65972fd86601f9f0d.zip
mips_malta: fix copy of the 0x1fc00000 region
Copy the whole 0x1fe000000 region into 0x1fc00000, independently of the
loaded BIOS size. This fix the MIPS make check tests.

Reported-by: Andreas Färber <afaerber@suse.de>
Tested-by: Andreas Färber <afaerber@suse.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--hw/mips/mips_malta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2dc66f7748..1589b59194 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1036,9 +1036,9 @@ void mips_malta_init(QEMUMachineInitArgs *args)
      */
     memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE);
     if (!rom_copy(memory_region_get_ram_ptr(bios_copy),
-                  FLASH_ADDRESS, bios_size)) {
+                  FLASH_ADDRESS, BIOS_SIZE)) {
         memcpy(memory_region_get_ram_ptr(bios_copy),
-               memory_region_get_ram_ptr(bios), bios_size);
+               memory_region_get_ram_ptr(bios), BIOS_SIZE);
     }
     memory_region_set_readonly(bios_copy, true);
     memory_region_add_subregion(system_memory, RESET_ADDRESS, bios_copy);