4 files changed, 5 insertions, 33 deletions
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c
index 0c7ac08ed5..709320b288 100644
--- a/src/drivers/uart/pl011.c
+++ b/src/drivers/uart/pl011.c
@@ -46,7 +46,7 @@ void uart_fill_lb(void *data)
 	struct lb_serial serial;
 	serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED;
 	serial.baseaddr = uart_platform_base(CONFIG_UART_FOR_CONSOLE);
-	serial.baud = default_baudrate();
+	serial.baud = CONFIG_TTYS0_BAUD;
 	serial.regwidth = 1;
 	serial.input_hertz = uart_platform_refclk();
 	serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index 4cc7fe3e0b..ace2c59fd5 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -107,7 +107,7 @@ void uart_init(int idx)
 {
 	if (!IS_ENABLED(CONFIG_DRIVERS_UART_8250IO_SKIP_INIT)) {
 		unsigned int div;
-		div = uart_baudrate_divisor(default_baudrate(),
+		div = uart_baudrate_divisor(CONFIG_TTYS0_BAUD,
 			uart_platform_refclk(), uart_input_clock_divider());
 		uart8250_init(uart_platform_base(idx), div);
 	}
@@ -134,7 +134,7 @@ void uart_fill_lb(void *data)
 	struct lb_serial serial;
 	serial.type = LB_SERIAL_TYPE_IO_MAPPED;
 	serial.baseaddr = uart_platform_base(CONFIG_UART_FOR_CONSOLE);
-	serial.baud = default_baudrate();
+	serial.baud = CONFIG_TTYS0_BAUD;
 	serial.regwidth = 1;
 	serial.input_hertz = uart_platform_refclk();
 	serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c
index a142cb111a..f293230e2e 100644
--- a/src/drivers/uart/uart8250mem.c
+++ b/src/drivers/uart/uart8250mem.c
@@ -119,7 +119,7 @@ void uart_init(int idx)
 		return;
 
 	unsigned int div;
-	div = uart_baudrate_divisor(default_baudrate(),
+	div = uart_baudrate_divisor(CONFIG_TTYS0_BAUD,
 		uart_platform_refclk(), uart_input_clock_divider());
 	uart8250_mem_init(base, div);
 }
@@ -154,7 +154,7 @@ void uart_fill_lb(void *data)
 	struct lb_serial serial;
 	serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED;
 	serial.baseaddr = uart_platform_base(CONFIG_UART_FOR_CONSOLE);
-	serial.baud = default_baudrate();
+	serial.baud = CONFIG_TTYS0_BAUD;
 	if (IS_ENABLED(CONFIG_DRIVERS_UART_8250MEM_32))
 		serial.regwidth = sizeof(uint32_t);
 	else
diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c
index 882e3ae784..c7b9ab21eb 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -13,34 +13,6 @@
 
 #include <console/console.h>
 #include <console/uart.h>
-#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)
-#include <option.h>
-#include "option_table.h"
-#endif
-
-#define DEFAULT_BAUDRATE	115200
-
-unsigned int default_baudrate(void)
-{
-#if !defined(__SMM__) && IS_ENABLED(CONFIG_USE_OPTION_TABLE)
-	static const unsigned baud[8] =
-		{ 115200, 57600, 38400, 19200, 9600, 4800, 2400, 1200 };
-	unsigned b_index = 0;
-#if defined(__ROMCC__)
-	b_index = read_option(baud_rate, 0xff);
-#else
-	if (get_option(&b_index, "baud_rate") != CB_SUCCESS)
-		b_index = 0xff;
-#endif
-	if (b_index < 8)
-		return baud[b_index];
-#endif
-	/*
-	 * If TTYS0_BAUD is not configured, then by default use 115200 as the
-	 * baud rate.
-	 */
-	return CONFIG_TTYS0_BAUD ? CONFIG_TTYS0_BAUD : DEFAULT_BAUDRATE;
-}
 
 /* Calculate divisor. Do not floor but round to nearest integer. */
 unsigned int uart_baudrate_divisor(unsigned int baudrate,