sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/*/*: Remove rtc nvram configurable baud rate

Browse Source 
There have been discussions about removing this since it does not seem
to be used much and only creates troubles for boards without defaults,
not to mention that it was configurable on many boards that do not
even feature uart.

It is still possible to configure the baudrate through the Kconfig
option.

Change-Id: I71698d9b188eeac73670b18b757dff5fcea0df41
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/19682
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Arthur Heymans
2017-05-12 21:16:41 +02:00
committed by Nico Huber
parent 1850aa6df6
commit b29078e401
242 changed files with 214 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/uart/pl011.c
View File

@@ -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;

4
src/drivers/uart/uart8250io.c
View File

@@ -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;

4
src/drivers/uart/uart8250mem.c
View File

@@ -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

28
src/drivers/uart/util.c
View File

@@ -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,