diff --git a/src/console/console.c b/src/console/console.c
index 877c8dc960..351c1e8f97 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -80,24 +80,3 @@ void console_write_line(uint8_t *buffer, size_t number_of_bytes)
 }
 
 
-#if CONFIG_GDB_STUB && (ENV_ROMSTAGE || ENV_RAMSTAGE)
-void gdb_hw_init(void)
-{
-	__gdb_hw_init();
-}
-
-void gdb_tx_byte(unsigned char byte)
-{
-	__gdb_tx_byte(byte);
-}
-
-void gdb_tx_flush(void)
-{
-	__gdb_tx_flush();
-}
-
-unsigned char gdb_rx_byte(void)
-{
-	return __gdb_rx_byte();
-}
-#endif
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index ace2c59fd5..e76d805f22 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -61,14 +61,10 @@ static int uart8250_can_rx_byte(unsigned base_port)
 
 static unsigned char uart8250_rx_byte(unsigned base_port)
 {
-	unsigned long int i = SINGLE_CHAR_TIMEOUT;
-	while (i && !uart8250_can_rx_byte(base_port))
-		i--;
+	while (!uart8250_can_rx_byte(base_port))
+		;
 
-	if (i)
-		return inb(base_port + UART8250_RBR);
-	else
-		return 0x0;
+	return inb(base_port + UART8250_RBR);
 }
 
 static void uart8250_init(unsigned base_port, unsigned divisor)
diff --git a/src/lib/debug-com.c b/src/lib/debug-com.c
index b8cfaa744c..1a34313e82 100644
--- a/src/lib/debug-com.c
+++ b/src/lib/debug-com.c
@@ -17,10 +17,10 @@
 #include <console/usb.h>
 #include <debug-com.h>
 
-#define CONFIG_UART_FOR_GDB 0
+#define CONFIG_UART_FOR_GDB 1
 #define USB_PIPE_FOR_GDB 0
 
-#define CONFIG_UART_FOR_SERIALICE 0
+#define CONFIG_UART_FOR_SERIALICE 1
 #define USB_PIPE_FOR_SERIALICE 0
 
 /* Configure functions to use GDB arguments */