diff options
242 files changed, 214 insertions, 1789 deletions
diff --git a/src/cpu/allwinner/a10/uart.c b/src/cpu/allwinner/a10/uart.c index 45dcaed1b2..f7c2db99b3 100644 --- a/src/cpu/allwinner/a10/uart.c +++ b/src/cpu/allwinner/a10/uart.c @@ -105,7 +105,7 @@ void uart_init(int idx) struct a10_uart *uart_base = uart_platform_baseptr(idx); /* Use default 8N1 encoding */ - a10_uart_configure(uart_base, default_baudrate(), + a10_uart_configure(uart_base, CONFIG_TTYS0_BAUD, 8, UART_PARITY_NONE, 1); a10_uart_enable_fifos(uart_base); } diff --git a/src/cpu/allwinner/a10/uart_console.c b/src/cpu/allwinner/a10/uart_console.c index e7774c9183..03d41228bc 100644 --- a/src/cpu/allwinner/a10/uart_console.c +++ b/src/cpu/allwinner/a10/uart_console.c @@ -44,7 +44,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 = 0; diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index 45a693a953..47b9a3d5cd 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/src/cpu/ti/am335x/uart.c @@ -163,7 +163,7 @@ void uart_init(int idx) { struct am335x_uart *uart = uart_platform_baseptr(idx); uint16_t div = (uint16_t) uart_baudrate_divisor( - default_baudrate(), uart_platform_refclk(), 16); + CONFIG_TTYS0_BAUD, uart_platform_refclk(), 16); am335x_uart_init(uart, div); } @@ -189,7 +189,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 = 2; lb_add_serial(&serial, data); 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, diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 744eb625f4..0dccd00d43 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -23,11 +23,6 @@ * baudrate generator. */ unsigned int uart_platform_refclk(void); -/* Return the baudrate determined from option_table, or when that is - * not used, CONFIG_TTYS0_BAUD. - */ -unsigned int default_baudrate(void); - /* Returns the divisor value for a given baudrate. * The formula to satisfy is: * refclk / divisor = baudrate * oversample diff --git a/src/mainboard/adi/rcc-dff/cmos.layout b/src/mainboard/adi/rcc-dff/cmos.layout index 235b63cdd9..a838b6015d 100644 --- a/src/mainboard/adi/rcc-dff/cmos.layout +++ b/src/mainboard/adi/rcc-dff/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -86,14 +86,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/advansus/a785e-i/cmos.layout b/src/mainboard/advansus/a785e-i/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/advansus/a785e-i/cmos.layout +++ b/src/mainboard/advansus/a785e-i/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/bettong/cmos.layout b/src/mainboard/amd/bettong/cmos.layout index c1338d3cdf..96aea1e8d3 100644 --- a/src/mainboard/amd/bettong/cmos.layout +++ b/src/mainboard/amd/bettong/cmos.layout @@ -43,7 +43,7 @@ entries 384 1 e 4 boot_option 386 1 e 1 ECC_memory 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -72,14 +72,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/bimini_fam10/cmos.layout b/src/mainboard/amd/bimini_fam10/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/amd/bimini_fam10/cmos.layout +++ b/src/mainboard/amd/bimini_fam10/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/db-ft3b-lc/cmos.layout b/src/mainboard/amd/db-ft3b-lc/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/amd/db-ft3b-lc/cmos.layout +++ b/src/mainboard/amd/db-ft3b-lc/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/db800/cmos.layout b/src/mainboard/amd/db800/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/amd/db800/cmos.layout +++ b/src/mainboard/amd/db800/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout index 93aa445656..c1c8f2f87b 100644 --- a/src/mainboard/amd/dbm690t/cmos.layout +++ b/src/mainboard/amd/dbm690t/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/dinar/cmos.layout b/src/mainboard/amd/dinar/cmos.layout index d18813aaf3..0e4ad462a0 100644 --- a/src/mainboard/amd/dinar/cmos.layout +++ b/src/mainboard/amd/dinar/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/f2950/cmos.layout b/src/mainboard/amd/f2950/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/amd/f2950/cmos.layout +++ b/src/mainboard/amd/f2950/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/gardenia/cmos.layout b/src/mainboard/amd/gardenia/cmos.layout index c1338d3cdf..96aea1e8d3 100644 --- a/src/mainboard/amd/gardenia/cmos.layout +++ b/src/mainboard/amd/gardenia/cmos.layout @@ -43,7 +43,7 @@ entries 384 1 e 4 boot_option 386 1 e 1 ECC_memory 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -72,14 +72,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/amd/inagua/cmos.layout +++ b/src/mainboard/amd/inagua/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/lamar/cmos.layout b/src/mainboard/amd/lamar/cmos.layout index f9e614dd7a..481338a983 100644 --- a/src/mainboard/amd/lamar/cmos.layout +++ b/src/mainboard/amd/lamar/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 444 1 e 1 nmi @@ -37,14 +37,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout index 0d4f95e04b..63d04ddbf4 100644 --- a/src/mainboard/amd/mahogany/cmos.layout +++ b/src/mainboard/amd/mahogany/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/amd/mahogany_fam10/cmos.layout +++ b/src/mainboard/amd/mahogany_fam10/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/norwich/cmos.layout b/src/mainboard/amd/norwich/cmos.layout index c724569209..8aa23fefe7 100644 --- a/src/mainboard/amd/norwich/cmos.layout +++ b/src/mainboard/amd/norwich/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 440 1 e 0 dcon_present @@ -19,14 +19,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/amd/olivehill/cmos.layout +++ b/src/mainboard/amd/olivehill/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/olivehillplus/cmos.layout b/src/mainboard/amd/olivehillplus/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/amd/olivehillplus/cmos.layout +++ b/src/mainboard/amd/olivehillplus/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/amd/parmer/cmos.layout +++ b/src/mainboard/amd/parmer/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/amd/persimmon/cmos.layout +++ b/src/mainboard/amd/persimmon/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout index 93aa445656..c1c8f2f87b 100644 --- a/src/mainboard/amd/pistachio/cmos.layout +++ b/src/mainboard/amd/pistachio/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/rumba/cmos.layout b/src/mainboard/amd/rumba/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/amd/rumba/cmos.layout +++ b/src/mainboard/amd/rumba/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout index e5964b42f4..c1745c546a 100644 --- a/src/mainboard/amd/serengeti_cheetah/cmos.layout +++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout index 7fad0be904..1bc969ea4e 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout +++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -52,14 +52,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/amd/south_station/cmos.layout +++ b/src/mainboard/amd/south_station/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/amd/thatcher/cmos.layout +++ b/src/mainboard/amd/thatcher/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/tilapia_fam10/cmos.layout b/src/mainboard/amd/tilapia_fam10/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/amd/tilapia_fam10/cmos.layout +++ b/src/mainboard/amd/tilapia_fam10/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/torpedo/cmos.layout b/src/mainboard/amd/torpedo/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/amd/torpedo/cmos.layout +++ b/src/mainboard/amd/torpedo/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/amd/union_station/cmos.layout +++ b/src/mainboard/amd/union_station/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/apple/macbook21/cmos.default b/src/mainboard/apple/macbook21/cmos.default index fcf5906d9a..dafd4746d7 100644 --- a/src/mainboard/apple/macbook21/cmos.default +++ b/src/mainboard/apple/macbook21/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout index 78d4702a56..2d1449e72a 100644 --- a/src/mainboard/apple/macbook21/cmos.layout +++ b/src/mainboard/apple/macbook21/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -92,14 +92,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/artecgroup/dbe61/cmos.layout b/src/mainboard/artecgroup/dbe61/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/artecgroup/dbe61/cmos.layout +++ b/src/mainboard/artecgroup/dbe61/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout index 0d4f95e04b..63d04ddbf4 100644 --- a/src/mainboard/asrock/939a785gmh/cmos.layout +++ b/src/mainboard/asrock/939a785gmh/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout index c7da8b82e6..67510eebe6 100644 --- a/src/mainboard/asrock/e350m1/cmos.layout +++ b/src/mainboard/asrock/e350m1/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -49,14 +49,6 @@ enumerations 3 2 Last 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asrock/g41c-gs/cmos.default b/src/mainboard/asrock/g41c-gs/cmos.default index 177af218c3..1519fe1b5e 100644 --- a/src/mainboard/asrock/g41c-gs/cmos.default +++ b/src/mainboard/asrock/g41c-gs/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/asrock/g41c-gs/cmos.layout b/src/mainboard/asrock/g41c-gs/cmos.layout index c67cf73d57..038e344ccc 100644 --- a/src/mainboard/asrock/g41c-gs/cmos.layout +++ b/src/mainboard/asrock/g41c-gs/cmos.layout @@ -44,11 +44,10 @@ entries # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option 388 4 h 0 reboot_counter -#390 2 r 0 unused? +#390 5 r 0 unused? # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate 395 4 e 6 debug_level #399 1 r 0 unused @@ -80,14 +79,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/asrock/imb-a180/cmos.layout +++ b/src/mainboard/asrock/imb-a180/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/a8n_e/cmos.default b/src/mainboard/asus/a8n_e/cmos.default index 520f237946..84dd0274af 100644 --- a/src/mainboard/asus/a8n_e/cmos.default +++ b/src/mainboard/asus/a8n_e/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable ECC_memory=Disable diff --git a/src/mainboard/asus/a8n_e/cmos.layout b/src/mainboard/asus/a8n_e/cmos.layout index c4b81c64f1..bf1454881f 100644 --- a/src/mainboard/asus/a8n_e/cmos.layout +++ b/src/mainboard/asus/a8n_e/cmos.layout @@ -3,7 +3,7 @@ entries 384 1 e 4 boot_option 386 1 e 1 ECC_memory 388 4 h 0 reboot_counter - 392 3 e 5 baud_rate +# 392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -27,14 +27,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal - 5 0 115200 - 5 1 57600 - 5 2 38400 - 5 3 19200 - 5 4 9600 - 5 5 4800 - 5 6 2400 - 5 7 1200 6 6 Notice 6 7 Info diff --git a/src/mainboard/asus/a8v-e_deluxe/cmos.layout b/src/mainboard/asus/a8v-e_deluxe/cmos.layout index fadba1ea8e..e13df93981 100644 --- a/src/mainboard/asus/a8v-e_deluxe/cmos.layout +++ b/src/mainboard/asus/a8v-e_deluxe/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout index fadba1ea8e..e13df93981 100644 --- a/src/mainboard/asus/a8v-e_se/cmos.layout +++ b/src/mainboard/asus/a8v-e_se/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout index 06d46ff7f0..6f5898e171 100644 --- a/src/mainboard/asus/dsbf/cmos.layout +++ b/src/mainboard/asus/dsbf/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -82,14 +82,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/asus/f2a85-m/cmos.layout +++ b/src/mainboard/asus/f2a85-m/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/k8v-x/cmos.layout b/src/mainboard/asus/k8v-x/cmos.layout index fadba1ea8e..e13df93981 100644 --- a/src/mainboard/asus/k8v-x/cmos.layout +++ b/src/mainboard/asus/k8v-x/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/kcma-d8/cmos.default b/src/mainboard/asus/kcma-d8/cmos.default index ba9ba3babe..5fa6a8da6b 100644 --- a/src/mainboard/asus/kcma-d8/cmos.default +++ b/src/mainboard/asus/kcma-d8/cmos.default @@ -1,4 +1,3 @@ -baud_rate = 115200 debug_level = Spew multi_core = Enable slow_cpu = off diff --git a/src/mainboard/asus/kcma-d8/cmos.layout b/src/mainboard/asus/kcma-d8/cmos.layout index 0bab4c9dd2..4ce870f70e 100644 --- a/src/mainboard/asus/kcma-d8/cmos.layout +++ b/src/mainboard/asus/kcma-d8/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -72,14 +72,6 @@ enumerations 3 2 Last 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/asus/kfsn4-dre/cmos.default b/src/mainboard/asus/kfsn4-dre/cmos.default index 0c147b2113..f257088bbb 100644 --- a/src/mainboard/asus/kfsn4-dre/cmos.default +++ b/src/mainboard/asus/kfsn4-dre/cmos.default @@ -1,4 +1,3 @@ -baud_rate = 115200 debug_level = Spew multi_core = Enable slow_cpu = off diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout index d0f6211b7a..3c0757d5ea 100644 --- a/src/mainboard/asus/kfsn4-dre/cmos.layout +++ b/src/mainboard/asus/kfsn4-dre/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 8 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -53,14 +53,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.default b/src/mainboard/asus/kfsn4-dre_k8/cmos.default index 6c61564b9b..d3a8081d95 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/cmos.default +++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.default @@ -1,4 +1,3 @@ -baud_rate = 115200 debug_level = Spew multi_core = Enable slow_cpu = off diff --git a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout index d6ac1bcbc4..86b95a94e4 100644 --- a/src/mainboard/asus/kfsn4-dre_k8/cmos.layout +++ b/src/mainboard/asus/kfsn4-dre_k8/cmos.layout @@ -21,7 +21,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate +393 3 r 0 unused 396 1 e 1 hw_scrubber 397 1 e 1 interleave_chip_selects 398 1 e 1 interleave_nodes @@ -51,14 +51,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/asus/kgpe-d16/cmos.default b/src/mainboard/asus/kgpe-d16/cmos.default index 481022c729..3e7ed3253e 100644 --- a/src/mainboard/asus/kgpe-d16/cmos.default +++ b/src/mainboard/asus/kgpe-d16/cmos.default @@ -1,4 +1,3 @@ -baud_rate = 115200 debug_level = Spew multi_core = Enable slow_cpu = off diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout index e65f7c8448..1c8d4662c3 100644 --- a/src/mainboard/asus/kgpe-d16/cmos.layout +++ b/src/mainboard/asus/kgpe-d16/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -73,14 +73,6 @@ enumerations 3 2 Last 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout index 9968c56898..50b9f0cb25 100644 --- a/src/mainboard/asus/m2n-e/cmos.layout +++ b/src/mainboard/asus/m2n-e/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout index 96e5c640ab..a1be31e9a2 100644 --- a/src/mainboard/asus/m2v-mx_se/cmos.layout +++ b/src/mainboard/asus/m2v-mx_se/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -31,14 +31,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m2v/cmos.layout b/src/mainboard/asus/m2v/cmos.layout index fadba1ea8e..e13df93981 100644 --- a/src/mainboard/asus/m2v/cmos.layout +++ b/src/mainboard/asus/m2v/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m4a78-em/cmos.layout b/src/mainboard/asus/m4a78-em/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/asus/m4a78-em/cmos.layout +++ b/src/mainboard/asus/m4a78-em/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m4a785-m/cmos.layout b/src/mainboard/asus/m4a785-m/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/asus/m4a785-m/cmos.layout +++ b/src/mainboard/asus/m4a785-m/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m4a785t-m/cmos.default b/src/mainboard/asus/m4a785t-m/cmos.default index f336bd3607..4c2e807e8e 100644 --- a/src/mainboard/asus/m4a785t-m/cmos.default +++ b/src/mainboard/asus/m4a785t-m/cmos.default @@ -1,6 +1,5 @@ boot_option=Fallback ECC_memory=Enable -baud_rate=115200 hw_scrubber=Enable interleave_chip_selects=Enable max_mem_clock=400Mhz diff --git a/src/mainboard/asus/m4a785t-m/cmos.layout b/src/mainboard/asus/m4a785t-m/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/asus/m4a785t-m/cmos.layout +++ b/src/mainboard/asus/m4a785t-m/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/m5a88-v/cmos.layout b/src/mainboard/asus/m5a88-v/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/asus/m5a88-v/cmos.layout +++ b/src/mainboard/asus/m5a88-v/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/mew-vm/cmos.layout b/src/mainboard/asus/mew-vm/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/asus/mew-vm/cmos.layout +++ b/src/mainboard/asus/mew-vm/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/asus/p5gc-mx/cmos.default b/src/mainboard/asus/p5gc-mx/cmos.default index 9a47cf9549..d269afcb6d 100644 --- a/src/mainboard/asus/p5gc-mx/cmos.default +++ b/src/mainboard/asus/p5gc-mx/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/asus/p5gc-mx/cmos.layout b/src/mainboard/asus/p5gc-mx/cmos.layout index eaf51bb6e6..77a318d21e 100644 --- a/src/mainboard/asus/p5gc-mx/cmos.layout +++ b/src/mainboard/asus/p5gc-mx/cmos.layout @@ -26,7 +26,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -66,14 +66,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/avalue/eax-785e/cmos.layout b/src/mainboard/avalue/eax-785e/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/avalue/eax-785e/cmos.layout +++ b/src/mainboard/avalue/eax-785e/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/bachmann/ot200/cmos.default b/src/mainboard/bachmann/ot200/cmos.default index 0b685c9c10..3e6d135052 100644 --- a/src/mainboard/bachmann/ot200/cmos.default +++ b/src/mainboard/bachmann/ot200/cmos.default @@ -1,3 +1,2 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout index 9b247a1565..88b1c64c21 100644 --- a/src/mainboard/bachmann/ot200/cmos.layout +++ b/src/mainboard/bachmann/ot200/cmos.layout @@ -24,7 +24,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 1 baud_rate +#392 3 r 0 unused 395 4 e 2 debug_level # ----------------------------------------------------------------- @@ -34,14 +34,6 @@ entries enumerations #ID value text -1 0 115200 -1 1 57600 -1 2 38400 -1 3 19200 -1 4 9600 -1 5 4800 -1 6 2400 -1 7 1200 2 0 Emergency 2 1 Alert 2 2 Critical diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/bap/ode_e20XX/cmos.layout +++ b/src/mainboard/bap/ode_e20XX/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/bap/ode_e21XX/cmos.layout b/src/mainboard/bap/ode_e21XX/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/bap/ode_e21XX/cmos.layout +++ b/src/mainboard/bap/ode_e21XX/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/bcom/winnetp680/cmos.layout b/src/mainboard/bcom/winnetp680/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/bcom/winnetp680/cmos.layout +++ b/src/mainboard/bcom/winnetp680/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout index d8384e34e3..68cf089141 100644 --- a/src/mainboard/biostar/am1ml/cmos.layout +++ b/src/mainboard/biostar/am1ml/cmos.layout @@ -43,7 +43,7 @@ entries 384 1 e 4 boot_option 386 1 e 1 ECC_memory 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -72,14 +72,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout index c5db29ca32..8b35950ddb 100644 --- a/src/mainboard/broadcom/blast/cmos.layout +++ b/src/mainboard/broadcom/blast/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/digitallogic/msm800sev/cmos.layout b/src/mainboard/digitallogic/msm800sev/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/digitallogic/msm800sev/cmos.layout +++ b/src/mainboard/digitallogic/msm800sev/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/elmex/pcm205400/cmos.layout b/src/mainboard/elmex/pcm205400/cmos.layout index f47185f896..9859577d1a 100644 --- a/src/mainboard/elmex/pcm205400/cmos.layout +++ b/src/mainboard/elmex/pcm205400/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 r 0 reboot_bits -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.default b/src/mainboard/emulation/qemu-i440fx/cmos.default index 1b0a1e79ee..82e6fabab9 100644 --- a/src/mainboard/emulation/qemu-i440fx/cmos.default +++ b/src/mainboard/emulation/qemu-i440fx/cmos.default @@ -1,5 +1,4 @@ boot_option = Fallback -baud_rate = 115200 power_on_after_fail = Enable debug_level = Spew ECC_memory = Disable diff --git a/src/mainboard/emulation/qemu-i440fx/cmos.layout b/src/mainboard/emulation/qemu-i440fx/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/emulation/qemu-i440fx/cmos.layout +++ b/src/mainboard/emulation/qemu-i440fx/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/esd/atom15/cmos.layout b/src/mainboard/esd/atom15/cmos.layout index fc92f96f00..e686727013 100644 --- a/src/mainboard/esd/atom15/cmos.layout +++ b/src/mainboard/esd/atom15/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -87,14 +87,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/foxconn/g41s-k/cmos.default b/src/mainboard/foxconn/g41s-k/cmos.default index 177af218c3..1519fe1b5e 100644 --- a/src/mainboard/foxconn/g41s-k/cmos.default +++ b/src/mainboard/foxconn/g41s-k/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/foxconn/g41s-k/cmos.layout b/src/mainboard/foxconn/g41s-k/cmos.layout index c67cf73d57..038e344ccc 100644 --- a/src/mainboard/foxconn/g41s-k/cmos.layout +++ b/src/mainboard/foxconn/g41s-k/cmos.layout @@ -44,11 +44,10 @@ entries # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option 388 4 h 0 reboot_counter -#390 2 r 0 unused? +#390 5 r 0 unused? # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate 395 4 e 6 debug_level #399 1 r 0 unused @@ -80,14 +79,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout index 6d5dc8e2d6..71aa19e9dd 100644 --- a/src/mainboard/getac/p470/cmos.layout +++ b/src/mainboard/getac/p470/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -92,14 +92,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default index 9a47cf9549..d269afcb6d 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout index 47f48ddffb..7ff7d92123 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout +++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -88,14 +88,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default index 767372cd23..a313f681cc 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default +++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable nmi=Enable diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout index 5600a6b635..72569b2c27 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout +++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default index 767372cd23..a313f681cc 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default +++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable nmi=Enable diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout index 5600a6b635..72569b2c27 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout +++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default index 303c4c29b7..8d844bda4f 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default +++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable nmi=Enable diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout index fac9d3594d..f5f309c66a 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout +++ b/src/mainboard/gigabyte/ga-g41m-es2l/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -80,14 +80,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout +++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gigabyte/m57sli/cmos.default b/src/mainboard/gigabyte/m57sli/cmos.default index 2514fa0ae7..62068cf4a7 100644 --- a/src/mainboard/gigabyte/m57sli/cmos.default +++ b/src/mainboard/gigabyte/m57sli/cmos.default @@ -1,4 +1,3 @@ -baud_rate = 115200 debug_level = Spew multi_core = Enable slow_cpu = off diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/gigabyte/m57sli/cmos.layout +++ b/src/mainboard/gigabyte/m57sli/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gigabyte/ma785gm/cmos.layout b/src/mainboard/gigabyte/ma785gm/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/gigabyte/ma785gm/cmos.layout +++ b/src/mainboard/gigabyte/ma785gm/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gigabyte/ma785gmt/cmos.layout b/src/mainboard/gigabyte/ma785gmt/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/gigabyte/ma785gmt/cmos.layout +++ b/src/mainboard/gigabyte/ma785gmt/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gigabyte/ma78gm/cmos.layout b/src/mainboard/gigabyte/ma78gm/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/gigabyte/ma78gm/cmos.layout +++ b/src/mainboard/gigabyte/ma78gm/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout index 33ed614898..e50416880d 100644 --- a/src/mainboard/gizmosphere/gizmo/cmos.layout +++ b/src/mainboard/gizmosphere/gizmo/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/gizmosphere/gizmo2/cmos.layout +++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout index b575e02970..64ae59b6b9 100644 --- a/src/mainboard/google/auron/cmos.layout +++ b/src/mainboard/google/auron/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/beltino/cmos.layout b/src/mainboard/google/beltino/cmos.layout index b575e02970..64ae59b6b9 100644 --- a/src/mainboard/google/beltino/cmos.layout +++ b/src/mainboard/google/beltino/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout index 180751d971..29fe11f77a 100644 --- a/src/mainboard/google/butterfly/cmos.layout +++ b/src/mainboard/google/butterfly/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console # No serial port on this motherboard -#392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -92,14 +92,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/chell/cmos.layout b/src/mainboard/google/chell/cmos.layout index 91a1336104..e22c6ab3d0 100644 --- a/src/mainboard/google/chell/cmos.layout +++ b/src/mainboard/google/chell/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout index ae46e10647..0a1cb4810a 100644 --- a/src/mainboard/google/cyan/cmos.layout +++ b/src/mainboard/google/cyan/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout index 91a1336104..e22c6ab3d0 100644 --- a/src/mainboard/google/glados/cmos.layout +++ b/src/mainboard/google/glados/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout index c508d64ebe..e5866a9422 100644 --- a/src/mainboard/google/jecht/cmos.layout +++ b/src/mainboard/google/jecht/cmos.layout @@ -69,7 +69,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -106,14 +106,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/kahlee/cmos.layout b/src/mainboard/google/kahlee/cmos.layout index b00693dcc2..b9b67ddaeb 100644 --- a/src/mainboard/google/kahlee/cmos.layout +++ b/src/mainboard/google/kahlee/cmos.layout @@ -43,7 +43,7 @@ entries 384 1 e 4 boot_option 386 1 e 1 ECC_memory 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 e 5 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -74,14 +74,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/google/lars/cmos.layout b/src/mainboard/google/lars/cmos.layout index 1c166c6756..e01c96469d 100644 --- a/src/mainboard/google/lars/cmos.layout +++ b/src/mainboard/google/lars/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout index 91dc89017a..d1015851bc 100644 --- a/src/mainboard/google/link/cmos.layout +++ b/src/mainboard/google/link/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout index 91dc89017a..d1015851bc 100644 --- a/src/mainboard/google/parrot/cmos.layout +++ b/src/mainboard/google/parrot/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout index b575e02970..64ae59b6b9 100644 --- a/src/mainboard/google/rambi/cmos.layout +++ b/src/mainboard/google/rambi/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout index b575e02970..64ae59b6b9 100644 --- a/src/mainboard/google/slippy/cmos.layout +++ b/src/mainboard/google/slippy/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout index 91dc89017a..d1015851bc 100644 --- a/src/mainboard/google/stout/cmos.layout +++ b/src/mainboard/google/stout/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/hp/abm/cmos.layout +++ b/src/mainboard/hp/abm/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/hp/dl145_g1/cmos.layout b/src/mainboard/hp/dl145_g1/cmos.layout index c5db29ca32..8b35950ddb 100644 --- a/src/mainboard/hp/dl145_g1/cmos.layout +++ b/src/mainboard/hp/dl145_g1/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout index e5964b42f4..c1745c546a 100644 --- a/src/mainboard/hp/dl145_g3/cmos.layout +++ b/src/mainboard/hp/dl145_g3/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout index 21bbf283b1..40d93aa5d6 100644 --- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout +++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -51,14 +51,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout index 6aea94f412..a78e9ccf3d 100644 --- a/src/mainboard/ibase/mb899/cmos.layout +++ b/src/mainboard/ibase/mb899/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -102,14 +102,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/iei/kino-780am2-fam10/cmos.layout b/src/mainboard/iei/kino-780am2-fam10/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/iei/kino-780am2-fam10/cmos.layout +++ b/src/mainboard/iei/kino-780am2-fam10/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout index 6d7e031bd6..93a32fa364 100644 --- a/src/mainboard/intel/baskingridge/cmos.layout +++ b/src/mainboard/intel/baskingridge/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -80,14 +80,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout index c3d557eaf0..c6276a8e89 100644 --- a/src/mainboard/intel/bayleybay_fsp/cmos.layout +++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -79,14 +79,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout index 27ad8be975..cf1c69610b 100644 --- a/src/mainboard/intel/camelbackmountain_fsp/cmos.layout +++ b/src/mainboard/intel/camelbackmountain_fsp/cmos.layout @@ -69,7 +69,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -101,14 +101,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/cougar_canyon2/cmos.layout b/src/mainboard/intel/cougar_canyon2/cmos.layout index d33634a88a..0dbc95c8cd 100644 --- a/src/mainboard/intel/cougar_canyon2/cmos.layout +++ b/src/mainboard/intel/cougar_canyon2/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -85,14 +85,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/d510mo/cmos.default b/src/mainboard/intel/d510mo/cmos.default index 488aa37bcc..2b090009e6 100644 --- a/src/mainboard/intel/d510mo/cmos.default +++ b/src/mainboard/intel/d510mo/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/intel/d510mo/cmos.layout b/src/mainboard/intel/d510mo/cmos.layout index 3e96412b8d..898fa2a741 100644 --- a/src/mainboard/intel/d510mo/cmos.layout +++ b/src/mainboard/intel/d510mo/cmos.layout @@ -30,7 +30,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -64,14 +64,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/d945gclf/cmos.default b/src/mainboard/intel/d945gclf/cmos.default index 9a47cf9549..d269afcb6d 100644 --- a/src/mainboard/intel/d945gclf/cmos.default +++ b/src/mainboard/intel/d945gclf/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout index 47f48ddffb..7ff7d92123 100644 --- a/src/mainboard/intel/d945gclf/cmos.layout +++ b/src/mainboard/intel/d945gclf/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -88,14 +88,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/dg43gt/cmos.default b/src/mainboard/intel/dg43gt/cmos.default index 9a61c07a94..0229e668a5 100644 --- a/src/mainboard/intel/dg43gt/cmos.default +++ b/src/mainboard/intel/dg43gt/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/intel/dg43gt/cmos.layout b/src/mainboard/intel/dg43gt/cmos.layout index e5e2a97609..a94adfbc52 100644 --- a/src/mainboard/intel/dg43gt/cmos.layout +++ b/src/mainboard/intel/dg43gt/cmos.layout @@ -44,13 +44,11 @@ entries # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option 388 4 h 0 reboot_counter -#390 2 r 0 unused? +#390 5 r 0 unused? # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate 395 4 e 6 debug_level -#399 1 r 0 unused # coreboot config options: southbridge 408 1 e 10 sata_mode @@ -80,14 +78,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout index 873f938998..eace7e704e 100644 --- a/src/mainboard/intel/eagleheights/cmos.layout +++ b/src/mainboard/intel/eagleheights/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -80,14 +80,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout index 3cc675f3aa..d6aed7ef2c 100644 --- a/src/mainboard/intel/emeraldlake2/cmos.layout +++ b/src/mainboard/intel/emeraldlake2/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/kblrvp/cmos.layout b/src/mainboard/intel/kblrvp/cmos.layout index e6d8acc60f..feda382369 100644 --- a/src/mainboard/intel/kblrvp/cmos.layout +++ b/src/mainboard/intel/kblrvp/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout index 1c166c6756..e01c96469d 100644 --- a/src/mainboard/intel/kunimitsu/cmos.layout +++ b/src/mainboard/intel/kunimitsu/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/littleplains/cmos.layout b/src/mainboard/intel/littleplains/cmos.layout index 235b63cdd9..a838b6015d 100644 --- a/src/mainboard/intel/littleplains/cmos.layout +++ b/src/mainboard/intel/littleplains/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -86,14 +86,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout index fc92f96f00..e686727013 100644 --- a/src/mainboard/intel/minnowmax/cmos.layout +++ b/src/mainboard/intel/minnowmax/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -87,14 +87,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout index 235b63cdd9..a838b6015d 100644 --- a/src/mainboard/intel/mohonpeak/cmos.layout +++ b/src/mainboard/intel/mohonpeak/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -86,14 +86,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/stargo2/cmos.layout b/src/mainboard/intel/stargo2/cmos.layout index ed2c93a66b..442f34e62d 100644 --- a/src/mainboard/intel/stargo2/cmos.layout +++ b/src/mainboard/intel/stargo2/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout index ae46e10647..0a1cb4810a 100644 --- a/src/mainboard/intel/strago/cmos.layout +++ b/src/mainboard/intel/strago/cmos.layout @@ -70,7 +70,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout index b575e02970..64ae59b6b9 100644 --- a/src/mainboard/intel/wtm2/cmos.layout +++ b/src/mainboard/intel/wtm2/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -84,14 +84,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/iwave/iWRainbowG6/cmos.layout b/src/mainboard/iwave/iWRainbowG6/cmos.layout index 4fd2d9198a..1081a15049 100644 --- a/src/mainboard/iwave/iWRainbowG6/cmos.layout +++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -93,14 +93,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout index e5964b42f4..c1745c546a 100644 --- a/src/mainboard/iwill/dk8_htx/cmos.layout +++ b/src/mainboard/iwill/dk8_htx/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/jetway/j7f2/cmos.layout b/src/mainboard/jetway/j7f2/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/jetway/j7f2/cmos.layout +++ b/src/mainboard/jetway/j7f2/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout +++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/jetway/pa78vm5/cmos.layout b/src/mainboard/jetway/pa78vm5/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/jetway/pa78vm5/cmos.layout +++ b/src/mainboard/jetway/pa78vm5/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout index 499bd432a8..d917c63529 100644 --- a/src/mainboard/kontron/986lcd-m/cmos.layout +++ b/src/mainboard/kontron/986lcd-m/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -105,14 +105,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout index 93aa445656..c1c8f2f87b 100644 --- a/src/mainboard/kontron/kt690/cmos.layout +++ b/src/mainboard/kontron/kt690/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout index 7cf10402d7..fde236afea 100644 --- a/src/mainboard/kontron/ktqm77/cmos.layout +++ b/src/mainboard/kontron/ktqm77/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -106,14 +106,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/lanner/em8510/cmos.layout +++ b/src/mainboard/lanner/em8510/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout index 249564693d..5e489a3e45 100644 --- a/src/mainboard/lenovo/g505s/cmos.layout +++ b/src/mainboard/lenovo/g505s/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -45,14 +45,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/lenovo/l520/cmos.default b/src/mainboard/lenovo/l520/cmos.default index c88318235b..035fd94d66 100644 --- a/src/mainboard/lenovo/l520/cmos.default +++ b/src/mainboard/lenovo/l520/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/l520/cmos.layout b/src/mainboard/lenovo/l520/cmos.layout index 678b7a8a22..d1bc017a35 100644 --- a/src/mainboard/lenovo/l520/cmos.layout +++ b/src/mainboard/lenovo/l520/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -98,14 +98,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t400/cmos.default b/src/mainboard/lenovo/t400/cmos.default index 8955b18bc7..05c56d958a 100644 --- a/src/mainboard/lenovo/t400/cmos.default +++ b/src/mainboard/lenovo/t400/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable volume=0x3 diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout index 4f89e2d754..e7b593e75c 100644 --- a/src/mainboard/lenovo/t400/cmos.layout +++ b/src/mainboard/lenovo/t400/cmos.layout @@ -49,7 +49,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t420/cmos.default b/src/mainboard/lenovo/t420/cmos.default index ee01f0956d..3fae7c028b 100644 --- a/src/mainboard/lenovo/t420/cmos.default +++ b/src/mainboard/lenovo/t420/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout index 96cba62599..2cfe87a414 100644 --- a/src/mainboard/lenovo/t420/cmos.layout +++ b/src/mainboard/lenovo/t420/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -100,14 +100,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t420s/cmos.default b/src/mainboard/lenovo/t420s/cmos.default index ee01f0956d..3fae7c028b 100644 --- a/src/mainboard/lenovo/t420s/cmos.default +++ b/src/mainboard/lenovo/t420s/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout index 73a0b4bcba..60b0051715 100644 --- a/src/mainboard/lenovo/t420s/cmos.layout +++ b/src/mainboard/lenovo/t420s/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -100,14 +100,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t430/cmos.layout b/src/mainboard/lenovo/t430/cmos.layout index 5565d3bee2..fc8f375025 100644 --- a/src/mainboard/lenovo/t430/cmos.layout +++ b/src/mainboard/lenovo/t430/cmos.layout @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default index c88318235b..035fd94d66 100644 --- a/src/mainboard/lenovo/t430s/cmos.default +++ b/src/mainboard/lenovo/t430s/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout index 1f696505c8..5e92d8f5e9 100644 --- a/src/mainboard/lenovo/t430s/cmos.layout +++ b/src/mainboard/lenovo/t430s/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -98,14 +98,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t520/cmos.default b/src/mainboard/lenovo/t520/cmos.default index 5c21f9c7fa..76852cfe78 100644 --- a/src/mainboard/lenovo/t520/cmos.default +++ b/src/mainboard/lenovo/t520/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout index 80759040a7..06a4a74233 100644 --- a/src/mainboard/lenovo/t520/cmos.layout +++ b/src/mainboard/lenovo/t520/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t530/cmos.default b/src/mainboard/lenovo/t530/cmos.default index 5c21f9c7fa..76852cfe78 100644 --- a/src/mainboard/lenovo/t530/cmos.default +++ b/src/mainboard/lenovo/t530/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout index ab67a53e0d..8304d52c7b 100644 --- a/src/mainboard/lenovo/t530/cmos.layout +++ b/src/mainboard/lenovo/t530/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -100,14 +100,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/t60/cmos.default b/src/mainboard/lenovo/t60/cmos.default index b22ff414d4..46a28318d6 100644 --- a/src/mainboard/lenovo/t60/cmos.default +++ b/src/mainboard/lenovo/t60/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout index b11852ac06..8fb4ecff90 100644 --- a/src/mainboard/lenovo/t60/cmos.layout +++ b/src/mainboard/lenovo/t60/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -107,14 +107,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.default b/src/mainboard/lenovo/x1_carbon_gen1/cmos.default index f7e38d2ee7..02f7c74bd8 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.default +++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout index 3766453a8c..4bc5220298 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout +++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x200/cmos.default b/src/mainboard/lenovo/x200/cmos.default index b484b6a77b..a4555c2308 100644 --- a/src/mainboard/lenovo/x200/cmos.default +++ b/src/mainboard/lenovo/x200/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable volume=0x3 diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout index f3cfe70459..8faecefe54 100644 --- a/src/mainboard/lenovo/x200/cmos.layout +++ b/src/mainboard/lenovo/x200/cmos.layout @@ -49,7 +49,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -97,14 +97,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default index 9f1e31ded2..df8e880409 100644 --- a/src/mainboard/lenovo/x201/cmos.default +++ b/src/mainboard/lenovo/x201/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout index 8b40585260..b07ffb947a 100644 --- a/src/mainboard/lenovo/x201/cmos.layout +++ b/src/mainboard/lenovo/x201/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -93,14 +93,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default index 54245524ab..08c754bfaa 100644 --- a/src/mainboard/lenovo/x220/cmos.default +++ b/src/mainboard/lenovo/x220/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout index 93e7ba98aa..38784c04fd 100644 --- a/src/mainboard/lenovo/x220/cmos.layout +++ b/src/mainboard/lenovo/x220/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x230/cmos.default b/src/mainboard/lenovo/x230/cmos.default index c88318235b..035fd94d66 100644 --- a/src/mainboard/lenovo/x230/cmos.default +++ b/src/mainboard/lenovo/x230/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout index 799145742c..a2e8fd9890 100644 --- a/src/mainboard/lenovo/x230/cmos.layout +++ b/src/mainboard/lenovo/x230/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -99,14 +99,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lenovo/x60/cmos.default b/src/mainboard/lenovo/x60/cmos.default index 9ed16d0b07..3a0c94c161 100644 --- a/src/mainboard/lenovo/x60/cmos.default +++ b/src/mainboard/lenovo/x60/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew hyper_threading=Enable nmi=Enable diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout index 76714394eb..2f8e1012b1 100644 --- a/src/mainboard/lenovo/x60/cmos.layout +++ b/src/mainboard/lenovo/x60/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -106,14 +106,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/lippert/frontrunner-af/cmos.layout +++ b/src/mainboard/lippert/frontrunner-af/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/lippert/frontrunner/cmos.layout b/src/mainboard/lippert/frontrunner/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/lippert/frontrunner/cmos.layout +++ b/src/mainboard/lippert/frontrunner/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/lippert/toucan-af/cmos.layout +++ b/src/mainboard/lippert/toucan-af/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout index 02c3a96ce8..c16c25a464 100644 --- a/src/mainboard/msi/ms7135/cmos.layout +++ b/src/mainboard/msi/ms7135/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -33,14 +33,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout index 89a7b1325b..b16d8f0836 100644 --- a/src/mainboard/msi/ms7260/cmos.layout +++ b/src/mainboard/msi/ms7260/cmos.layout @@ -21,7 +21,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -48,14 +48,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms7721/cmos.layout b/src/mainboard/msi/ms7721/cmos.layout index 75a2d30eb1..25860f62ef 100644 --- a/src/mainboard/msi/ms7721/cmos.layout +++ b/src/mainboard/msi/ms7721/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout index 41c4ac9206..016d3f171e 100644 --- a/src/mainboard/msi/ms9185/cmos.layout +++ b/src/mainboard/msi/ms9185/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout index c5db29ca32..8b35950ddb 100644 --- a/src/mainboard/msi/ms9282/cmos.layout +++ b/src/mainboard/msi/ms9282/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout index 7fad0be904..331e0162bb 100644 --- a/src/mainboard/msi/ms9652_fam10/cmos.layout +++ b/src/mainboard/msi/ms9652_fam10/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -52,14 +52,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/nvidia/l1_2pvv/cmos.layout +++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/packardbell/ms2290/cmos.default b/src/mainboard/packardbell/ms2290/cmos.default index 43c09e8b85..ccdb7c8c7e 100644 --- a/src/mainboard/packardbell/ms2290/cmos.default +++ b/src/mainboard/packardbell/ms2290/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Disable nmi=Enable diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout index 09a5d498e6..24e9dc01e3 100644 --- a/src/mainboard/packardbell/ms2290/cmos.layout +++ b/src/mainboard/packardbell/ms2290/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -75,14 +75,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/pcengines/alix1c/cmos.default b/src/mainboard/pcengines/alix1c/cmos.default index 19b5ab749f..6cbaa7ce25 100644 --- a/src/mainboard/pcengines/alix1c/cmos.default +++ b/src/mainboard/pcengines/alix1c/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback ECC_memory=Disable -baud_rate=115200 power_on_after_fail=Disable debug_level=Spew diff --git a/src/mainboard/pcengines/alix1c/cmos.layout b/src/mainboard/pcengines/alix1c/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/pcengines/alix1c/cmos.layout +++ b/src/mainboard/pcengines/alix1c/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/pcengines/alix2d/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/pcengines/alix2d/cmos.layout +++ b/src/mainboard/pcengines/alix2d/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/pcengines/apu1/cmos.default b/src/mainboard/pcengines/apu1/cmos.default index 31d5a31405..57a2a8caaf 100644 --- a/src/mainboard/pcengines/apu1/cmos.default +++ b/src/mainboard/pcengines/apu1/cmos.default @@ -1,4 +1,3 @@ boot_option=Fallback multi_core=Enable debug_level=Spew -baud_rate=115200 diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout index 1c560ebe77..f2c551f4bf 100644 --- a/src/mainboard/pcengines/apu1/cmos.layout +++ b/src/mainboard/pcengines/apu1/cmos.layout @@ -6,10 +6,9 @@ entries # leave 3 bits to make checksummed area start byte-aligned 392 1 e 2 boot_option 393 1 e 1 multi_core -394 3 e 3 baud_rate -#397 3 unused +#394 6 unused 400 4 e 4 debug_level -# leave 4 bits to make checksummed area end byte-aligned +# leave 7 bits to make checksummed area end byte-aligned 408 16 h 0 check_sum enumerations @@ -21,15 +20,6 @@ enumerations ## for boot_option 2 0 Fallback 2 1 Normal -## for baud_rate -3 0 115200 -3 1 57600 -3 2 38400 -3 3 19200 -3 4 9600 -3 5 4800 -3 6 2400 -3 7 1200 ## for debug_level 4 0 Emerg 4 1 Alert diff --git a/src/mainboard/pcengines/apu2/cmos.layout b/src/mainboard/pcengines/apu2/cmos.layout index d83bb14d26..1b7e9c35c9 100644 --- a/src/mainboard/pcengines/apu2/cmos.layout +++ b/src/mainboard/pcengines/apu2/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 r 0 reboot_bits -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -44,14 +44,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout index 761732efbf..eea7342aa2 100644 --- a/src/mainboard/roda/rk886ex/cmos.layout +++ b/src/mainboard/roda/rk886ex/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -93,14 +93,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout index f775afe4c7..2d2f5896fb 100644 --- a/src/mainboard/roda/rk9/cmos.layout +++ b/src/mainboard/roda/rk9/cmos.layout @@ -49,7 +49,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -88,14 +88,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/roda/rv11/cmos.layout b/src/mainboard/roda/rv11/cmos.layout index 588a3c34da..55cc85c23a 100644 --- a/src/mainboard/roda/rv11/cmos.layout +++ b/src/mainboard/roda/rv11/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 4 baud_rate +#392 3 r 0 unused 395 4 e 5 debug_level #399 1 r 0 unused @@ -94,14 +94,6 @@ enumerations 2 1 Disable 3 0 Fallback 3 1 Normal -4 0 115200 -4 1 57600 -4 2 38400 -4 3 19200 -4 4 9600 -4 5 4800 -4 6 2400 -4 7 1200 5 1 Emergency 5 2 Alert 5 3 Critical diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout index 531c162c97..2e0976ba79 100644 --- a/src/mainboard/samsung/lumpy/cmos.layout +++ b/src/mainboard/samsung/lumpy/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout index eba4d4367e..10c7d92327 100644 --- a/src/mainboard/samsung/stumpy/cmos.layout +++ b/src/mainboard/samsung/stumpy/cmos.layout @@ -47,7 +47,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.default b/src/mainboard/sapphire/pureplatinumh61/cmos.default index 767372cd23..a313f681cc 100644 --- a/src/mainboard/sapphire/pureplatinumh61/cmos.default +++ b/src/mainboard/sapphire/pureplatinumh61/cmos.default @@ -1,5 +1,4 @@ boot_option=Fallback -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable nmi=Enable diff --git a/src/mainboard/sapphire/pureplatinumh61/cmos.layout b/src/mainboard/sapphire/pureplatinumh61/cmos.layout index a90e27dc51..61a063dba3 100644 --- a/src/mainboard/sapphire/pureplatinumh61/cmos.layout +++ b/src/mainboard/sapphire/pureplatinumh61/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -89,14 +89,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/siemens/mc_bdx1/cmos.layout b/src/mainboard/siemens/mc_bdx1/cmos.layout index 27ad8be975..cf1c69610b 100644 --- a/src/mainboard/siemens/mc_bdx1/cmos.layout +++ b/src/mainboard/siemens/mc_bdx1/cmos.layout @@ -69,7 +69,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -101,14 +101,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/siemens/mc_tcu3/cmos.layout b/src/mainboard/siemens/mc_tcu3/cmos.layout index 27ad8be975..cf1c69610b 100644 --- a/src/mainboard/siemens/mc_tcu3/cmos.layout +++ b/src/mainboard/siemens/mc_tcu3/cmos.layout @@ -69,7 +69,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -101,14 +101,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.default b/src/mainboard/siemens/sitemp_g1p1/cmos.default index b5305a1a19..3440a20c10 100644 --- a/src/mainboard/siemens/sitemp_g1p1/cmos.default +++ b/src/mainboard/siemens/sitemp_g1p1/cmos.default @@ -1,6 +1,5 @@ boot_option=Fallback cmos_defaults_loaded=Yes -baud_rate=115200 debug_level=Spew power_on_after_fail=Enable nmi=Enable diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout index ec84e9dc51..f7571cc309 100644 --- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout +++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout @@ -31,7 +31,7 @@ entries #386 1 r 1 unused 387 1 e 16 cmos_defaults_loaded 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused #395 1 r 1 unused #396 1 r 1 unused #397 2 r 8 unused @@ -80,14 +80,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 4 Warning 6 5 Notice 6 6 Info diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout index c5db29ca32..8b35950ddb 100644 --- a/src/mainboard/sunw/ultra40/cmos.layout +++ b/src/mainboard/sunw/ultra40/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/sunw/ultra40m2/cmos.layout b/src/mainboard/sunw/ultra40m2/cmos.layout index d501be58cd..c00426d30f 100644 --- a/src/mainboard/sunw/ultra40m2/cmos.layout +++ b/src/mainboard/sunw/ultra40m2/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/supermicro/h8dme/cmos.layout +++ b/src/mainboard/supermicro/h8dme/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/supermicro/h8dmr/cmos.layout +++ b/src/mainboard/supermicro/h8dmr/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout index 7fad0be904..331e0162bb 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout +++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -52,14 +52,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/supermicro/h8qgi/cmos.layout b/src/mainboard/supermicro/h8qgi/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/supermicro/h8qgi/cmos.layout +++ b/src/mainboard/supermicro/h8qgi/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout index 7fad0be904..331e0162bb 100644 --- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout +++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout @@ -21,8 +21,8 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +393 3 r 0 unused +#394 7 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -52,14 +52,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/supermicro/h8scm/cmos.layout b/src/mainboard/supermicro/h8scm/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/supermicro/h8scm/cmos.layout +++ b/src/mainboard/supermicro/h8scm/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/h8scm_fam10/cmos.layout b/src/mainboard/supermicro/h8scm_fam10/cmos.layout index aca27b0779..1d957dc98e 100644 --- a/src/mainboard/supermicro/h8scm_fam10/cmos.layout +++ b/src/mainboard/supermicro/h8scm_fam10/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -30,14 +30,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/supermicro/x7db8/cmos.layout b/src/mainboard/supermicro/x7db8/cmos.layout index 06d46ff7f0..6f5898e171 100644 --- a/src/mainboard/supermicro/x7db8/cmos.layout +++ b/src/mainboard/supermicro/x7db8/cmos.layout @@ -48,7 +48,7 @@ entries # ----------------------------------------------------------------- # coreboot config options: console -392 3 e 5 baud_rate +#392 3 r 0 unused 395 4 e 6 debug_level #399 1 r 0 unused @@ -82,14 +82,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 1 Emergency 6 2 Alert 6 3 Critical diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout index 93aa445656..c1c8f2f87b 100644 --- a/src/mainboard/technexion/tim5690/cmos.layout +++ b/src/mainboard/technexion/tim5690/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout index 93aa445656..c1c8f2f87b 100644 --- a/src/mainboard/technexion/tim8690/cmos.layout +++ b/src/mainboard/technexion/tim8690/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/traverse/geos/cmos.layout b/src/mainboard/traverse/geos/cmos.layout index c724569209..8aa23fefe7 100644 --- a/src/mainboard/traverse/geos/cmos.layout +++ b/src/mainboard/traverse/geos/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 440 1 e 0 dcon_present @@ -19,14 +19,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout index a6d7a6e810..f4268101a6 100644 --- a/src/mainboard/tyan/s2912/cmos.layout +++ b/src/mainboard/tyan/s2912/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -47,14 +47,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout index 7fad0be904..42b34aeec0 100644 --- a/src/mainboard/tyan/s2912_fam10/cmos.layout +++ b/src/mainboard/tyan/s2912_fam10/cmos.layout @@ -21,8 +21,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -393 3 e 5 baud_rate -#396 5 unused +#393 8 unused 401 1 e 1 interleave_chip_selects 402 1 e 1 interleave_nodes 403 1 e 1 interleave_memory_channels @@ -52,14 +51,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 0 Emergency 6 1 Alert 6 2 Critical diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout index ca3d9e5e3c..956aba3689 100644 --- a/src/mainboard/tyan/s8226/cmos.layout +++ b/src/mainboard/tyan/s8226/cmos.layout @@ -19,7 +19,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -46,14 +46,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/via/epia-cn/cmos.layout b/src/mainboard/via/epia-cn/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/via/epia-cn/cmos.layout +++ b/src/mainboard/via/epia-cn/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/via/epia-m700/cmos.layout b/src/mainboard/via/epia-m700/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/via/epia-m700/cmos.layout +++ b/src/mainboard/via/epia-m700/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout index ba4ba59125..92473e8cfd 100644 --- a/src/mainboard/via/pc2500e/cmos.layout +++ b/src/mainboard/via/pc2500e/cmos.layout @@ -20,7 +20,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -33,14 +33,6 @@ enumerations 1 1 Enable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout index f20d3cfb1b..de4f5e79b9 100644 --- a/src/mainboard/via/vt8454c/cmos.layout +++ b/src/mainboard/via/vt8454c/cmos.layout @@ -19,7 +19,7 @@ entries 384 1 e 4 boot_option 456 1 e 1 ECC_memory 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 1008 16 h 0 check_sum @@ -33,14 +33,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/winent/mb6047/cmos.layout b/src/mainboard/winent/mb6047/cmos.layout index 3d09360b56..0bf2dc44d9 100644 --- a/src/mainboard/winent/mb6047/cmos.layout +++ b/src/mainboard/winent/mb6047/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 395 1 e 1 hw_scrubber 396 1 e 1 interleave_chip_selects 397 2 e 8 max_mem_clock @@ -31,14 +31,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/winent/pl6064/cmos.layout b/src/mainboard/winent/pl6064/cmos.layout index d9ec5520bf..b8ea9363a4 100644 --- a/src/mainboard/winent/pl6064/cmos.layout +++ b/src/mainboard/winent/pl6064/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/winnet/g170/cmos.layout b/src/mainboard/winnet/g170/cmos.layout index d9ec5520bf..5db20b1e69 100644 --- a/src/mainboard/winnet/g170/cmos.layout +++ b/src/mainboard/winnet/g170/cmos.layout @@ -3,7 +3,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 8 e unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -18,14 +18,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout index 3be09dc8cf..b7deea89f9 100644 --- a/src/mainboard/wyse/s50/cmos.layout +++ b/src/mainboard/wyse/s50/cmos.layout @@ -21,7 +21,7 @@ entries 0 384 r 0 reserved_memory 384 1 e 4 boot_option 388 4 h 0 reboot_counter -392 3 e 5 baud_rate +#392 3 r 0 unused 400 1 e 1 power_on_after_fail 412 4 e 6 debug_level 456 1 e 1 ECC_memory @@ -36,14 +36,6 @@ enumerations 2 1 Disable 4 0 Fallback 4 1 Normal -5 0 115200 -5 1 57600 -5 2 38400 -5 3 19200 -5 4 9600 -5 5 4800 -5 6 2400 -5 7 1200 6 6 Notice 6 7 Info 6 8 Debug diff --git a/src/soc/broadcom/cygnus/ns16550.c b/src/soc/broadcom/cygnus/ns16550.c index aa9dd2d818..e7008274f6 100644 --- a/src/soc/broadcom/cygnus/ns16550.c +++ b/src/soc/broadcom/cygnus/ns16550.c @@ -120,7 +120,7 @@ void uart_fill_lb(void *data) struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; serial.baseaddr = (uintptr_t)regs; - serial.baud = default_baudrate(); + serial.baud = CONFIG_TTYS0_BAUD; serial.regwidth = 4; lb_add_serial(&serial, data); diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c index 1f39e8b7e7..df1a5ace04 100644 --- a/src/soc/imgtec/pistachio/uart.c +++ b/src/soc/imgtec/pistachio/uart.c @@ -150,7 +150,7 @@ void uart_fill_lb(void *data) struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; serial.baseaddr = CONFIG_CONSOLE_SERIAL_UART_ADDRESS; - serial.baud = default_baudrate(); + serial.baud = CONFIG_TTYS0_BAUD; serial.regwidth = 1 << UART_SHIFT; lb_add_serial(&serial, data); diff --git a/src/soc/mediatek/mt8173/uart.c b/src/soc/mediatek/mt8173/uart.c index d0b140d14d..36a279fa65 100644 --- a/src/soc/mediatek/mt8173/uart.c +++ b/src/soc/mediatek/mt8173/uart.c @@ -177,7 +177,7 @@ void uart_fill_lb(void *data) struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; serial.baseaddr = UART0_BASE; - serial.baud = default_baudrate(); + serial.baud = CONFIG_TTYS0_BAUD; serial.regwidth = 4; lb_add_serial(&serial, data); diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c index 76ea4261a0..0d5233788d 100644 --- a/src/soc/nvidia/tegra124/uart.c +++ b/src/soc/nvidia/tegra124/uart.c @@ -136,7 +136,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 = 4; lb_add_serial(&serial, data); diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c index 608b443dea..1c52687491 100644 --- a/src/soc/nvidia/tegra210/uart.c +++ b/src/soc/nvidia/tegra210/uart.c @@ -123,7 +123,7 @@ void uart_fill_lb(void *data) struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; serial.baseaddr = CONFIG_CONSOLE_SERIAL_TEGRA210_UART_ADDRESS; - serial.baud = default_baudrate(); + serial.baud = CONFIG_TTYS0_BAUD; serial.regwidth = 4; lb_add_serial(&serial, data); diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c index 2ea390b933..671a6d1281 100644 --- a/src/soc/qualcomm/ipq40xx/uart.c +++ b/src/soc/qualcomm/ipq40xx/uart.c @@ -297,7 +297,7 @@ void uart_fill_lb(void *data) serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; serial.baseaddr = (uint32_t)UART1_DM_BASE; - serial.baud = default_baudrate(); + serial.baud = CONFIG_TTYS0_BAUD; serial.regwidth = 1; lb_add_serial(&serial, data); diff --git a/src/soc/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c index 07f1e34cce..7ad6cbe6d9 100644 --- a/src/soc/samsung/exynos5250/uart.c +++ b/src/soc/samsung/exynos5250/uart.c @@ -61,7 +61,7 @@ static void serial_setbrg_dev(struct s5p_uart *uart) // All UARTs share the same clock. uclk = clock_get_periph_rate(PERIPH_ID_UART3); - val = uclk / default_baudrate(); + val = uclk / CONFIG_TTYS0_BAUD; write32(&uart->ubrdiv, val / 16 - 1); @@ -191,7 +191,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 = 4; lb_add_serial(&serial, data); diff --git a/src/soc/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c index 6f54c003ba..a38be07d13 100644 --- a/src/soc/samsung/exynos5420/uart.c +++ b/src/soc/samsung/exynos5420/uart.c @@ -61,7 +61,7 @@ static void serial_setbrg_dev(struct s5p_uart *uart) // All UARTs share the same clock. uclk = clock_get_periph_rate(PERIPH_ID_UART3); - val = uclk / default_baudrate(); + val = uclk / CONFIG_TTYS0_BAUD; write32(&uart->ubrdiv, val / 16 - 1); @@ -182,7 +182,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 = 4; serial.input_hertz = uart_platform_refclk(); serial.uart_pci_addr = 0; |