--- trunk/src/machines/machine_evbmips.c 2007/10/08 16:22:20 41 +++ trunk/src/machines/machine_evbmips.c 2007/10/08 16:22:32 42 @@ -25,7 +25,9 @@ * SUCH DAMAGE. * * - * $Id: machine_evbmips.c,v 1.20 2007/04/10 16:51:35 debug Exp $ + * $Id: machine_evbmips.c,v 1.27 2007/06/15 18:08:10 debug Exp $ + * + * COMMENT: MIPS evaluation boards (e.g. Malta) */ #include @@ -50,7 +52,7 @@ struct pci_data *pci_data; int i; - /* See http://www.netbsd.org/Ports/evbmips/ for more info. */ + /* See http://www.netbsd.org/ports/evbmips/ for more info. */ switch (machine->machine_subtype) { case MACHINE_EVBMIPS_MALTA: @@ -59,7 +61,6 @@ machine->emulated_hz = 33000000; cpu->byte_order = EMUL_LITTLE_ENDIAN; machine->machine_name = "MALTA (evbmips, little endian)"; - machine->stable = 1; if (machine->machine_subtype == MACHINE_EVBMIPS_MALTA_BE) { machine->machine_name = "MALTA (evbmips, big endian)"; @@ -84,7 +85,7 @@ pci_data = dev_gt_init(machine, machine->memory, 0x1be00000, tmpstr, tmpstr2, 120); - if (machine->use_x11) { + if (machine->x11_md.in_use) { if (strlen(machine->boot_string_argument) < 3) { fatal("WARNING: remember to use -o 'console=" "tty0' if you are emulating Linux. (Not" @@ -167,6 +168,7 @@ case MACHINE_EVBMIPS_MALTA: case MACHINE_EVBMIPS_MALTA_BE: + /* 5Kc = MIPS64 rev 1, 5KE = MIPS64 rev 2 */ machine->cpu_name = strdup("5Kc"); break; @@ -178,8 +180,6 @@ MACHINE_DEFAULT_RAM(evbmips) { - /* MeshCube is always (?) 64 MB, and the others work fine - with 64 MB too. */ machine->physical_ram_in_mb = 64; }