Patchwork mips_malta: fix copy of the 0x1fc00000

login
register
mail settings
Submitter Aurelien Jarno
Date July 29, 2013, 5:08 a.m.
Message ID <1375074491-5905-1-git-send-email-aurelien@aurel32.net>
Download mbox | patch
Permalink /patch/262672/
State New
Headers show

Comments

Aurelien Jarno - July 29, 2013, 5:08 a.m.
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>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 hw/mips/mips_malta.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Andreas Färber - July 29, 2013, 5:12 a.m.
Am 29.07.2013 07:08, schrieb Aurelien Jarno:
> 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>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Leon Alrae <leon.alrae@imgtec.com>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Tested-by: Andreas Färber <afaerber@suse.de>

Thanks for the quick fix!

Andreas

Patch

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2dc66f7..1589b59 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);