Update Changelog with new Xscale platforms and vmsvga.

[qemu] / hw / mips_malta.c

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 6af5e52..1ab5940 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -28,6 +28,8 @@
 #include "net.h"
 #include "boards.h"
 #include "smbus.h"
+#include "block.h"
+#include "flash.h"
 #include "mips.h"
 #include "pci.h"
 #include "qemu-char.h"
@@ -35,6 +37,8 @@
 #include "audio/audio.h"
 #include "boards.h"
 
+//#define DEBUG_BOARD_INIT
+
 #ifdef TARGET_WORDS_BIGENDIAN
 #define BIOS_FILENAME "mips_bios.bin"
 #else
@@ -766,13 +770,13 @@ void mips_malta_init (int ram_size, int vga_ram_size,
 {
     char buf[1024];
     unsigned long bios_offset;
+    target_long bios_size;
     int64_t kernel_entry;
     PCIBus *pci_bus;
     CPUState *env;
     RTCState *rtc_state;
     fdctrl_t *floppy_controller;
     MaltaFPGAState *malta_fpga;
-    int ret;
     qemu_irq *i8259;
     int piix4_devfn;
     uint8_t *eeprom_buf;
@@ -781,6 +785,8 @@ void mips_malta_init (int ram_size, int vga_ram_size,
     int index;
     BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     BlockDriverState *fd[MAX_FD];
+    int fl_idx = 0;
+    int fl_sectors = 0;
 
     /* init CPUs */
     if (cpu_model == NULL) {
@@ -801,7 +807,7 @@ void mips_malta_init (int ram_size, int vga_ram_size,
     /* allocate RAM */
     cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
 
-    /* Map the bios at two physical locations, as on the real board */
+    /* Map the bios at two physical locations, as on the real board. */
     bios_offset = ram_size + vga_ram_size;
     cpu_register_physical_memory(0x1e000000LL,
                                  BIOS_SIZE, bios_offset | IO_MEM_ROM);
@@ -811,17 +817,44 @@ void mips_malta_init (int ram_size, int vga_ram_size,
     /* FPGA */
     malta_fpga = malta_fpga_init(0x1f000000LL, env);
 
-    /* Load a BIOS image unless a kernel image has been specified. */
-    if (!kernel_filename) {
-        if (bios_name == NULL)
-            bios_name = BIOS_FILENAME;
-        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
-        ret = load_image(buf, phys_ram_base + bios_offset);
-        if (ret < 0 || ret > BIOS_SIZE) {
-            fprintf(stderr,
-                    "qemu: Could not load MIPS bios '%s', and no -kernel argument was specified\n",
-                    buf);
-            exit(1);
+    /* Load firmware in flash / BIOS unless we boot directly into a kernel. */
+    if (kernel_filename) {
+        /* Write a small bootloader to the flash location. */
+        loaderparams.ram_size = ram_size;
+        loaderparams.kernel_filename = kernel_filename;
+        loaderparams.kernel_cmdline = kernel_cmdline;
+        loaderparams.initrd_filename = initrd_filename;
+        kernel_entry = load_kernel(env);
+        env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
+        write_bootloader(env, bios_offset, kernel_entry);
+    } else {
+        index = drive_get_index(IF_PFLASH, 0, fl_idx);
+        if (index != -1) {
+            /* Load firmware from flash. */
+            bios_size = 0x400000;
+            fl_sectors = bios_size >> 16;
+#ifdef DEBUG_BOARD_INIT
+            printf("Register parallel flash %d size " TARGET_FMT_lx " at "
+                   "offset %08lx addr %08llx '%s' %x\n",
+                   fl_idx, bios_size, bios_offset, 0x1e000000LL,
+                   bdrv_get_device_name(drives_table[index].bdrv), fl_sectors);
+#endif
+            pflash_cfi01_register(0x1e000000LL, bios_offset,
+                                  drives_table[index].bdrv, 65536, fl_sectors,
+                                  4, 0x0000, 0x0000, 0x0000, 0x0000);
+            fl_idx++;
+        } else {
+            /* Load a BIOS image. */
+            if (bios_name == NULL)
+                bios_name = BIOS_FILENAME;
+            snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
+            bios_size = load_image(buf, phys_ram_base + bios_offset);
+            if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) {
+                fprintf(stderr,
+                        "qemu: Could not load MIPS bios '%s', and no -kernel argument was specified\n",
+                        buf);
+                exit(1);
+            }
         }
         /* In little endian mode the 32bit words in the bios are swapped,
            a neat trick which allows bi-endian firmware. */
@@ -829,26 +862,14 @@ void mips_malta_init (int ram_size, int vga_ram_size,
         {
             uint32_t *addr;
             for (addr = (uint32_t *)(phys_ram_base + bios_offset);
-                 addr < (uint32_t *)(phys_ram_base + bios_offset + ret);
-                addr++) {
+                 addr < (uint32_t *)(phys_ram_base + bios_offset + bios_size);
+                 addr++) {
                 *addr = bswap32(*addr);
             }
         }
 #endif
     }
 
-    /* If a kernel image has been specified, write a small bootloader
-       to the flash location. */
-    if (kernel_filename) {
-        loaderparams.ram_size = ram_size;
-        loaderparams.kernel_filename = kernel_filename;
-        loaderparams.kernel_cmdline = kernel_cmdline;
-        loaderparams.initrd_filename = initrd_filename;
-        kernel_entry = load_kernel(env);
-        env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
-        write_bootloader(env, bios_offset, kernel_entry);
-    }
-
     /* Board ID = 0x420 (Malta Board with CoreLV)
        XXX: theoretically 0x1e000010 should map to flash and 0x1fc00010 should
        map to the board ID. */