gwj / at91sam9263 · Commits

Commit e01f4a1ce007d455a1d7a6921411fc0bcc6ad4ec

Authored by blueswir1
1 parent 6106075b

Fix loading of binary ROMs 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4452 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
hw/sun4m.c
  View file @e01f4a1
@@ -435,7 +435,7 @@ static void sun4m_hw_init(const struct hwdef *hwdef, ram_addr_t RAM_size, @@ -435,7 +435,7 @@ static void sun4m_hw_init(const struct hwdef *hwdef, ram_addr_t RAM_size,
435 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); 435 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
436 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL); 436 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
437 if (ret < 0 || ret > PROM_SIZE_MAX) 437 if (ret < 0 || ret > PROM_SIZE_MAX)
438 - ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX); 438 + ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
439 if (ret < 0 || ret > PROM_SIZE_MAX) { 439 if (ret < 0 || ret > PROM_SIZE_MAX) {
440 fprintf(stderr, "qemu: could not load prom '%s'\n", 440 fprintf(stderr, "qemu: could not load prom '%s'\n",
441 buf); 441 buf);
@@ -605,7 +605,7 @@ static void sun4c_hw_init(const struct hwdef *hwdef, ram_addr_t RAM_size, @@ -605,7 +605,7 @@ static void sun4c_hw_init(const struct hwdef *hwdef, ram_addr_t RAM_size,
605 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); 605 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
606 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL); 606 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
607 if (ret < 0 || ret > PROM_SIZE_MAX) 607 if (ret < 0 || ret > PROM_SIZE_MAX)
608 - ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX); 608 + ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
609 if (ret < 0 || ret > PROM_SIZE_MAX) { 609 if (ret < 0 || ret > PROM_SIZE_MAX) {
610 fprintf(stderr, "qemu: could not load prom '%s'\n", 610 fprintf(stderr, "qemu: could not load prom '%s'\n",
611 buf); 611 buf);
@@ -1421,7 +1421,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, @@ -1421,7 +1421,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,
1421 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); 1421 snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
1422 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL); 1422 ret = load_elf(buf, hwdef->slavio_base - PROM_VADDR, NULL, NULL, NULL);
1423 if (ret < 0 || ret > PROM_SIZE_MAX) 1423 if (ret < 0 || ret > PROM_SIZE_MAX)
1424 - ret = load_image_targphys(buf, prom_offset, PROM_SIZE_MAX); 1424 + ret = load_image_targphys(buf, hwdef->slavio_base, PROM_SIZE_MAX);
1425 if (ret < 0 || ret > PROM_SIZE_MAX) { 1425 if (ret < 0 || ret > PROM_SIZE_MAX) {
1426 fprintf(stderr, "qemu: could not load prom '%s'\n", 1426 fprintf(stderr, "qemu: could not load prom '%s'\n",
1427 buf); 1427 buf);