Index: arm/allwinner/files.a10
===================================================================
--- arm/allwinner/files.a10	(revision 247078)
+++ arm/allwinner/files.a10	(working copy)
@@ -17,5 +17,5 @@
 arm/allwinner/aintc.c			standard
 arm/allwinner/bus_space.c		standard
 arm/allwinner/common.c			standard
-arm/allwinner/console.c			standard
+# arm/allwinner/console.c			standard
 arm/allwinner/a10_machdep.c		standard
Index: arm/conf/CUBIEBOARD
===================================================================
--- arm/conf/CUBIEBOARD	(revision 247078)
+++ arm/conf/CUBIEBOARD	(working copy)
@@ -78,7 +78,7 @@
 #device		mmcsd			# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
-options		ROOTDEVNAME=\"ufs:/dev/da0s2\"
+options		ROOTDEVNAME=\"ufs:/dev/da0s2\"
 
 # ATA controllers
 #device		ahci		# AHCI-compatible SATA controllers
@@ -87,8 +87,8 @@
 #options	ATA_STATIC_ID	# Static device numbering
 
 # Console and misc
-#device		uart
-#device		uart_ns8250
+device		uart
+device		uart_ns8250
 device		pty
 device		snp
 device		md