[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [4224] Flash support for mips r4k pseudo-machine, by
From: |
Thiemo Seufer |
Subject: |
[Qemu-devel] [4224] Flash support for mips r4k pseudo-machine, by |
Date: |
Sun, 20 Apr 2008 06:28:30 +0000 |
Revision: 4224
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4224
Author: ths
Date: 2008-04-20 06:28:28 +0000 (Sun, 20 Apr 2008)
Log Message:
-----------
Flash support for mips r4k pseudo-machine, by
Jean-Christophe Plagniol-Villard.
Modified Paths:
--------------
trunk/hw/mips_r4k.c
Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c 2008-04-20 03:40:20 UTC (rev 4223)
+++ trunk/hw/mips_r4k.c 2008-04-20 06:28:28 UTC (rev 4224)
@@ -14,6 +14,7 @@
#include "net.h"
#include "sysemu.h"
#include "boards.h"
+#include "flash.h"
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
@@ -144,6 +145,7 @@
load_kernel (env);
}
+static const int sector_len = 32 * 1024;
static
void mips_r4k_init (int ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
@@ -197,7 +199,17 @@
if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) {
cpu_register_physical_memory(0x1fc00000,
BIOS_SIZE, bios_offset | IO_MEM_ROM);
- } else {
+ } else if ((index = drive_get_index(IF_PFLASH, 0, 0)) > -1) {
+ uint32_t mips_rom = 0x00400000;
+ cpu_register_physical_memory(0x1fc00000, mips_rom,
+ qemu_ram_alloc(mips_rom) | IO_MEM_ROM);
+ if (!pflash_cfi01_register(0x1fc00000, qemu_ram_alloc(mips_rom),
+ drives_table[index].bdrv, sector_len, mips_rom / sector_len,
+ 4, 0, 0, 0, 0)) {
+ fprintf(stderr, "qemu: Error registering flash memory.\n");
+ }
+ }
+ else {
/* not fatal */
fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
buf);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [4224] Flash support for mips r4k pseudo-machine, by,
Thiemo Seufer <=