diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index c440c53a00..4fc7c9795a 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -68,11 +68,10 @@ $(obj)/linuxbios.lar: $(obj)/util/lar/lar lzma $(obj)/linuxbios.initram $(obj)/l
 # initram module and the various stages and payload files.
 #
 
-STAGE0_CONSOLE_OBJ   = $(obj)/vtxprintf.o $(obj)/vsprintf.o
+STAGE0_CONSOLE_OBJ   = $(obj)/vtxprintf.o $(obj)/vsprintf.o $(obj)/console.o
 STAGE0_LIB_OBJ       = $(obj)/uart8250.o $(obj)/mem.o $(obj)/elfboot.o \
 		       $(obj)/lar.o
-STAGE0_ARCH_X86_OBJ  = $(obj)/cachemain.o $(obj)/console.o $(obj)/serial.o \
-		       $(obj)/archelfboot.o
+STAGE0_ARCH_X86_OBJ  = $(obj)/cachemain.o $(obj)/serial.o $(obj)/archelfboot.o
 
 
 ifeq ($(CONFIG_CAR_TYPE_I586),y)
diff --git a/arch/x86/console.c b/console/console.c
similarity index 100%
rename from arch/x86/console.c
rename to console/console.c
diff --git a/mainboard/emulation/qemu-x86/setup_before_car.c b/mainboard/emulation/qemu-x86/setup_before_car.c
deleted file mode 100644
index f1a009b759..0000000000
--- a/mainboard/emulation/qemu-x86/setup_before_car.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 	
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <arch/types.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <device/pnp_def.h>
-
-/*
- */
-void udelay(int usecs)
-{
-	int i;
-	for (i = 0; i < usecs; i++)
-		outb(i & 0xff, 0x80);
-}
-
-void setup_before_car(void)
-{
-	outb(5, 0x80);
-
-	//uart_init();
-	//console_init();
-}