0.8.2-alt1

[qemu] / qemu / hw / sun4u.c

diff --git a/qemu/hw/sun4u.c b/qemu/hw/sun4u.c
index 571e2b3..6d41369 100644 (file)
--- a/qemu/hw/sun4u.c
+++ b/qemu/hw/sun4u.c
@@ -27,12 +27,12 @@
 #define KERNEL_LOAD_ADDR     0x00404000
 #define CMDLINE_ADDR         0x003ff000
 #define INITRD_LOAD_ADDR     0x00300000
+#define PROM_SIZE_MAX        (512 * 1024)
 #define PROM_ADDR           0x1fff0000000ULL
 #define APB_SPECIAL_BASE     0x1fe00000000ULL
 #define APB_MEM_BASE        0x1ff00000000ULL
 #define VGA_BASE            (APB_MEM_BASE + 0x400000ULL)
-#define PROM_FILENAMEB      "proll-sparc64.bin"
-#define PROM_FILENAMEE      "proll-sparc64.elf"
+#define PROM_FILENAME       "openbios-sparc64"
 #define NVRAM_SIZE           0x2000
 
 /* TSC handling */
@@ -277,25 +277,23 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
     cpu_register_physical_memory(0, ram_size, 0);
 
     prom_offset = ram_size + vga_ram_size;
+    cpu_register_physical_memory(PROM_ADDR, 
+                                 (PROM_SIZE_MAX + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, 
+                                 prom_offset | IO_MEM_ROM);
 
-    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEE);
-    ret = load_elf(buf, phys_ram_base + prom_offset);
-    if (ret < 0) {
-       snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAMEB);
-       ret = load_image(buf, phys_ram_base + prom_offset);
-    }
+    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, PROM_FILENAME);
+    ret = load_elf(buf, 0, NULL);
     if (ret < 0) {
        fprintf(stderr, "qemu: could not load prom '%s'\n", 
                buf);
        exit(1);
     }
-    cpu_register_physical_memory(PROM_ADDR, (ret + TARGET_PAGE_SIZE) & TARGET_PAGE_MASK, 
-                                 prom_offset | IO_MEM_ROM);
 
     kernel_size = 0;
     initrd_size = 0;
     if (linux_boot) {
-        kernel_size = load_elf(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
+        /* XXX: put correct offset */
+        kernel_size = load_elf(kernel_filename, 0, NULL);
         if (kernel_size < 0)
            kernel_size = load_aout(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
        if (kernel_size < 0)
@@ -326,12 +324,9 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
            }
         }
     }
-    pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE);
+    pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, NULL);
     isa_mem_base = VGA_BASE;
-    vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size, 0, 0);
-    cpu_register_physical_memory(VGA_BASE, vga_ram_size, ram_size);
-    //pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size);
+    pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, vga_ram_size);
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
@@ -347,7 +342,9 @@ static void sun4u_init(int ram_size, int vga_ram_size, int boot_device,
     }
 
     for(i = 0; i < nb_nics; i++) {
-       pci_ne2000_init(pci_bus, &nd_table[i]);
+        if (!nd_table[i].model)
+            nd_table[i].model = "ne2k_pci";
+       pci_nic_init(pci_bus, &nd_table[i]);
     }
 
     pci_cmd646_ide_init(pci_bus, bs_table, 1);