gwj / at91sam9263 · Commits

Commit 7ffa47675c3b0c7ee1deddb1d78bbf5f968f0cb0

Authored by pbrook
1 parent f753ff16

Use cpu_physical_memory_write_rom instead of memcpy. 

Signed-off-by: Glauber Costa <glommer@redhat.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7058 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
@@ -446,7 +446,7 @@ static void bochs_bios_init(void) @@ -446,7 +446,7 @@ static void bochs_bios_init(void)
446 446
447 /* Generate an initial boot sector which sets state and jump to 447 /* Generate an initial boot sector which sets state and jump to
448 a specified vector */ 448 a specified vector */
449 -static void generate_bootsect(uint8_t *option_rom, 449 +static void generate_bootsect(target_phys_addr_t option_rom,
450 uint32_t gpr[8], uint16_t segs[6], uint16_t ip) 450 uint32_t gpr[8], uint16_t segs[6], uint16_t ip)
451 { 451 {
452 uint8_t rom[512], *p, *reloc; 452 uint8_t rom[512], *p, *reloc;
@@ -520,7 +520,7 @@ static void generate_bootsect(uint8_t *option_rom, @@ -520,7 +520,7 @@ static void generate_bootsect(uint8_t *option_rom,
520 sum += rom[i]; 520 sum += rom[i];
521 rom[sizeof(rom) - 1] = -sum; 521 rom[sizeof(rom) - 1] = -sum;
522 522
523 - memcpy(option_rom, rom, sizeof(rom)); 523 + cpu_physical_memory_write_rom(option_rom, rom, sizeof(rom));
524 } 524 }
525 525
526 static long get_file_size(FILE *f) 526 static long get_file_size(FILE *f)
@@ -537,7 +537,7 @@ static long get_file_size(FILE *f) @@ -537,7 +537,7 @@ static long get_file_size(FILE *f)
537 return size; 537 return size;
538 } 538 }
539 539
540 -static void load_linux(uint8_t *option_rom, 540 +static void load_linux(target_phys_addr_t option_rom,
541 const char *kernel_filename, 541 const char *kernel_filename,
542 const char *initrd_filename, 542 const char *initrd_filename,
543 const char *kernel_cmdline) 543 const char *kernel_cmdline)
@@ -909,7 +909,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, @@ -909,7 +909,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
909 oprom_area_size = 0x8000; 909 oprom_area_size = 0x8000;
910 910
911 if (linux_boot) { 911 if (linux_boot) {
912 - load_linux(phys_ram_base + option_rom_offset + oprom_area_size, 912 + load_linux(0xc0000 + oprom_area_size,
913 kernel_filename, initrd_filename, kernel_cmdline); 913 kernel_filename, initrd_filename, kernel_cmdline);
914 oprom_area_size += 2048; 914 oprom_area_size += 2048;
915 } 915 }