Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 32ddab4e3c97ec2da367368b6a5ae66a60979eb9)
+++ kernel/arch/mips32/Makefile.inc	(revision a2a2a34a30c500db7cc8308839952d3f014a1e19)
@@ -53,13 +53,4 @@
 	GCC_CFLAGS += -EB -DBIG_ENDIAN -mips3
 endif
-ifeq ($(MACHINE),simics)
-	# SIMICS 4kc emulation is broken, although for instructions
-	# that do not bother us
-	
-	BFD_NAME = elf32-tradlittlemips
-	BFD = elf32-tradlittlemips
-	GCC_CFLAGS += -mhard-float -mips3 -DTLBCNT=16
-	TLBCNT = 16
-endif
 ifeq ($(MACHINE),msim)
 	BFD_NAME = elf32-tradlittlemips
@@ -86,5 +77,4 @@
 	arch/$(KARCH)/src/fpu_context.c \
 	arch/$(KARCH)/src/ddi/ddi.c \
-	arch/$(KARCH)/src/drivers/msim.c \
 	arch/$(KARCH)/src/smp/dorder.c \
 	arch/$(KARCH)/src/smp/smp.c
Index: rnel/arch/mips32/src/drivers/msim.c
===================================================================
--- kernel/arch/mips32/src/drivers/msim.c	(revision 32ddab4e3c97ec2da367368b6a5ae66a60979eb9)
+++ 	(revision )
@@ -1,159 +1,0 @@
-/*
- * Copyright (c) 2005 Ondrej Palkovsky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup mips32
- * @{
- */
-/** @file
- */
-
-#include <interrupt.h>
-#include <console/chardev.h>
-#include <arch/drivers/msim.h>
-#include <arch/cp0.h>
-#include <console/console.h>
-#include <sysinfo/sysinfo.h>
-#include <ddi/ddi.h>
-
-static chardev_t console;
-static irq_t msim_irq;
-
-static void msim_write(chardev_t *dev, const char ch, bool silent);
-static void msim_enable(chardev_t *dev);
-static void msim_disable(chardev_t *dev);
-static char msim_do_read(chardev_t *dev);
-
-static chardev_operations_t msim_ops = {
-	.resume = msim_enable,
-	.suspend = msim_disable,
-	.write = msim_write,
-	.read = msim_do_read,
-};
-
-/** Putchar that works with MSIM & gxemul */
-void msim_write(chardev_t *dev, const char ch, bool silent)
-{
-	if (!silent)
-		*((char *) MSIM_VIDEORAM) = ch;
-}
-
-/* Called from getc(). */
-void msim_enable(chardev_t *dev)
-{
-	cp0_unmask_int(MSIM_KBD_IRQ);
-}
-
-/* Called from getc(). */
-void msim_disable(chardev_t *dev)
-{
-	cp0_mask_int(MSIM_KBD_IRQ);
-}
-
-/** Read character using polling, assume interrupts disabled */
-static char msim_do_read(chardev_t *dev)
-{
-	char ch;
-	
-	while (1) {
-		ch = *((volatile char *) MSIM_KBD_ADDRESS);
-		if (ch) {
-			if (ch == '\r')
-				return '\n';
-			if (ch == 0x7f)
-				return '\b';
-			return ch;
-		}
-	}
-}
-
-/** Process keyboard interrupt. */
-static void msim_irq_handler(irq_t *irq)
-{
-	char ch = 0;
-		
-	ch = *((char *) MSIM_KBD_ADDRESS);
-	if (ch =='\r')
-		ch = '\n';
-	if (ch == 0x7f)
-		ch = '\b';
-	chardev_push_character(&console, ch);
-}
-
-static irq_ownership_t msim_claim(irq_t *irq)
-{
-	return IRQ_ACCEPT;
-}
-
-void msim_kbd_grab(void)
-{
-	ipl_t ipl = interrupts_disable();
-	spinlock_lock(&msim_irq.lock);
-	msim_irq.notif_cfg.notify = false;
-	spinlock_unlock(&msim_irq.lock);
-	interrupts_restore(ipl);
-}
-
-void msim_kbd_release(void)
-{
-	ipl_t ipl = interrupts_disable();
-	spinlock_lock(&msim_irq.lock);
-	if (msim_irq.notif_cfg.answerbox)
-		msim_irq.notif_cfg.notify = true;
-	spinlock_unlock(&msim_irq.lock);
-	interrupts_restore(ipl);
-}
-
-
-/* Return console object representing msim console */
-void msim_console(devno_t devno)
-{
-	chardev_initialize("msim_console", &console, &msim_ops);
-	stdin = &console;
-	stdout = &console;
-	
-	irq_initialize(&msim_irq);
-	msim_irq.devno = devno;
-	msim_irq.inr = MSIM_KBD_IRQ;
-	msim_irq.claim = msim_claim;
-	msim_irq.handler = msim_irq_handler;
-	irq_register(&msim_irq);
-	
-	cp0_unmask_int(MSIM_KBD_IRQ);
-	
-	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
-	
-	sysinfo_set_item_val("fb", NULL, true);
-	sysinfo_set_item_val("fb.kind", NULL, 3);
-	sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM));
-}
-
-/** @}
- */