diff --git a/Kconfig b/Kconfig
index c8a59b23eb..0c5bead1f5 100644
--- a/Kconfig
+++ b/Kconfig
@@ -11,3 +11,4 @@ source arch/Kconfig
 
 source lib/Kconfig
 
+source console/Kconfig
diff --git a/console/Kconfig b/console/Kconfig
new file mode 100644
index 0000000000..c8833b810e
--- /dev/null
+++ b/console/Kconfig
@@ -0,0 +1,27 @@
+#
+#
+#
+
+menu "Console"
+
+config CONSOLE_SERIAL
+	boolean "Support serial console (default)"
+	default y
+	---help---
+	  Send LinuxBIOS output to serial console 
+
+
+config CONSOLE_VGA
+	boolean "Support VGA console"
+	---help---
+	  Send LinuxBIOS output to VGA console as soon as VGA 
+	  is initialized.
+
+config CONSOLE_USB
+	boolean "Support USB2 debug console"
+	---help---
+	  Send LinuxBIOS output to USB debug console. Note: This requires
+	  a USB2 controller which supports the debug capability.
+
+endmenu
+
diff --git a/device/device.c b/device/device.c
index 4543bd79df..fa788b6557 100644
--- a/device/device.c
+++ b/device/device.c
@@ -404,7 +404,7 @@ void compute_allocate_resource(
 
 }
 
-#if CONFIG_CONSOLE_VGA == 1
+#if defined(CONFIG_CONSOLE_VGA) && CONFIG_CONSOLE_VGA == 1
 struct device * vga_pri = 0;
 static void allocate_vga_resource(void)
 {
@@ -763,7 +763,7 @@ void dev_phase4(void)
 	mem->flags |= IORESOURCE_ASSIGNED;
 	mem->flags &= ~IORESOURCE_STORED;
 
-#if CONFIG_CONSOLE_VGA == 1
+#if defined(CONFIG_CONSOLE_VGA) && CONFIG_CONSOLE_VGA == 1
 	/* Allocate the VGA I/O resource.. */
 	allocate_vga_resource(); 
 #endif
diff --git a/device/device_util.c b/device/device_util.c
index 0915ddbb08..b064f84ac9 100644
--- a/device/device_util.c
+++ b/device/device_util.c
@@ -450,7 +450,7 @@ const char *resource_type(struct resource *resource)
 void report_resource_stored(struct device * dev, struct resource *resource, const char *comment)
 {
 	if (resource->flags & IORESOURCE_STORED) {
-		unsigned char buf[10];
+		char buf[10];
 		unsigned long long base, end;
 		base = resource->base;
 		end = resource_end(resource);