Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5251
-gerrit
commit 0e230203fe50e037d3a92f7bc4dd5c03834ce93c Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sun Feb 16 06:55:41 2014 +0200
vortex86ex: Drop baudrate programming for 10 UARTs
This is responsibility of end-user application. When coreboot does it, it is only for the purpose of debug console.
Change-Id: Idbbf9528c60b9b819b7bea9dfe84078a3f055bc9 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/mainboard/dmp/vortex86ex/Kconfig | 260 --------------------------- src/southbridge/dmp/vortex86ex/southbridge.c | 4 +- 2 files changed, 1 insertion(+), 263 deletions(-)
diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig index b1db0dc..4b130b8 100644 --- a/src/mainboard/dmp/vortex86ex/Kconfig +++ b/src/mainboard/dmp/vortex86ex/Kconfig @@ -518,32 +518,6 @@ config UART1_IRQ default 14 if UART1_IRQ14 default 15 if UART1_IRQ15
-choice - prompt "UART1 Baud rate" - default UART1_BAUD_115200 - depends on UART1_ENABLE - -config UART1_BAUD_115200 - bool "115200" -config UART1_BAUD_57600 - bool "57600" -config UART1_BAUD_38400 - bool "38400" -config UART1_BAUD_19200 - bool "19200" -config UART1_BAUD_9600 - bool "9600" - -endchoice - -config UART1_BAUD - int - depends on UART1_ENABLE - default 115200 if UART1_BAUD_115200 - default 57600 if UART1_BAUD_57600 - default 38400 if UART1_BAUD_38400 - default 19200 if UART1_BAUD_19200 - default 9600 if UART1_BAUD_9600 # end of UART1
# Begin of UART2 @@ -630,32 +604,6 @@ config UART2_IRQ default 14 if UART2_IRQ14 default 15 if UART2_IRQ15
-choice - prompt "UART2 Baud rate" - default UART2_BAUD_115200 - depends on UART2_ENABLE - -config UART2_BAUD_115200 - bool "115200" -config UART2_BAUD_57600 - bool "57600" -config UART2_BAUD_38400 - bool "38400" -config UART2_BAUD_19200 - bool "19200" -config UART2_BAUD_9600 - bool "9600" - -endchoice - -config UART2_BAUD - int - depends on UART2_ENABLE - default 115200 if UART2_BAUD_115200 - default 57600 if UART2_BAUD_57600 - default 38400 if UART2_BAUD_38400 - default 19200 if UART2_BAUD_19200 - default 9600 if UART2_BAUD_9600 # end of UART2
# Begin of UART3 @@ -742,32 +690,6 @@ config UART3_IRQ default 14 if UART3_IRQ14 default 15 if UART3_IRQ15
-choice - prompt "UART3 Baud rate" - default UART3_BAUD_115200 - depends on UART3_ENABLE - -config UART3_BAUD_115200 - bool "115200" -config UART3_BAUD_57600 - bool "57600" -config UART3_BAUD_38400 - bool "38400" -config UART3_BAUD_19200 - bool "19200" -config UART3_BAUD_9600 - bool "9600" - -endchoice - -config UART3_BAUD - int - depends on UART3_ENABLE - default 115200 if UART3_BAUD_115200 - default 57600 if UART3_BAUD_57600 - default 38400 if UART3_BAUD_38400 - default 19200 if UART3_BAUD_19200 - default 9600 if UART3_BAUD_9600 # end of UART3
# Begin of UART4 @@ -854,32 +776,6 @@ config UART4_IRQ default 14 if UART4_IRQ14 default 15 if UART4_IRQ15
-choice - prompt "UART4 Baud rate" - default UART4_BAUD_115200 - depends on UART4_ENABLE - -config UART4_BAUD_115200 - bool "115200" -config UART4_BAUD_57600 - bool "57600" -config UART4_BAUD_38400 - bool "38400" -config UART4_BAUD_19200 - bool "19200" -config UART4_BAUD_9600 - bool "9600" - -endchoice - -config UART4_BAUD - int - depends on UART4_ENABLE - default 115200 if UART4_BAUD_115200 - default 57600 if UART4_BAUD_57600 - default 38400 if UART4_BAUD_38400 - default 19200 if UART4_BAUD_19200 - default 9600 if UART4_BAUD_9600 # end of UART4
# Begin of UART5 @@ -966,32 +862,6 @@ config UART5_IRQ default 14 if UART5_IRQ14 default 15 if UART5_IRQ15
-choice - prompt "UART5 Baud rate" - default UART5_BAUD_115200 - depends on UART5_ENABLE - -config UART5_BAUD_115200 - bool "115200" -config UART5_BAUD_57600 - bool "57600" -config UART5_BAUD_38400 - bool "38400" -config UART5_BAUD_19200 - bool "19200" -config UART5_BAUD_9600 - bool "9600" - -endchoice - -config UART5_BAUD - int - depends on UART5_ENABLE - default 115200 if UART5_BAUD_115200 - default 57600 if UART5_BAUD_57600 - default 38400 if UART5_BAUD_38400 - default 19200 if UART5_BAUD_19200 - default 9600 if UART5_BAUD_9600 # end of UART5
# Begin of UART6 @@ -1078,32 +948,6 @@ config UART6_IRQ default 14 if UART6_IRQ14 default 15 if UART6_IRQ15
-choice - prompt "UART6 Baud rate" - default UART6_BAUD_115200 - depends on UART6_ENABLE - -config UART6_BAUD_115200 - bool "115200" -config UART6_BAUD_57600 - bool "57600" -config UART6_BAUD_38400 - bool "38400" -config UART6_BAUD_19200 - bool "19200" -config UART6_BAUD_9600 - bool "9600" - -endchoice - -config UART6_BAUD - int - depends on UART6_ENABLE - default 115200 if UART6_BAUD_115200 - default 57600 if UART6_BAUD_57600 - default 38400 if UART6_BAUD_38400 - default 19200 if UART6_BAUD_19200 - default 9600 if UART6_BAUD_9600 # end of UART6
# Begin of UART7 @@ -1190,32 +1034,6 @@ config UART7_IRQ default 14 if UART7_IRQ14 default 15 if UART7_IRQ15
-choice - prompt "UART7 Baud rate" - default UART7_BAUD_115200 - depends on UART7_ENABLE - -config UART7_BAUD_115200 - bool "115200" -config UART7_BAUD_57600 - bool "57600" -config UART7_BAUD_38400 - bool "38400" -config UART7_BAUD_19200 - bool "19200" -config UART7_BAUD_9600 - bool "9600" - -endchoice - -config UART7_BAUD - int - depends on UART7_ENABLE - default 115200 if UART7_BAUD_115200 - default 57600 if UART7_BAUD_57600 - default 38400 if UART7_BAUD_38400 - default 19200 if UART7_BAUD_19200 - default 9600 if UART7_BAUD_9600 # end of UART7
# Begin of UART8 @@ -1302,32 +1120,6 @@ config UART8_IRQ default 14 if UART8_IRQ14 default 15 if UART8_IRQ15
-choice - prompt "UART8 Baud rate" - default UART8_BAUD_115200 - depends on UART8_ENABLE - -config UART8_BAUD_115200 - bool "115200" -config UART8_BAUD_57600 - bool "57600" -config UART8_BAUD_38400 - bool "38400" -config UART8_BAUD_19200 - bool "19200" -config UART8_BAUD_9600 - bool "9600" - -endchoice - -config UART8_BAUD - int - depends on UART8_ENABLE - default 115200 if UART8_BAUD_115200 - default 57600 if UART8_BAUD_57600 - default 38400 if UART8_BAUD_38400 - default 19200 if UART8_BAUD_19200 - default 9600 if UART8_BAUD_9600 # end of UART8
# Begin of UART9 @@ -1414,32 +1206,6 @@ config UART9_IRQ default 14 if UART9_IRQ14 default 15 if UART9_IRQ15
-choice - prompt "UART9 Baud rate" - default UART9_BAUD_115200 - depends on UART9_ENABLE - -config UART9_BAUD_115200 - bool "115200" -config UART9_BAUD_57600 - bool "57600" -config UART9_BAUD_38400 - bool "38400" -config UART9_BAUD_19200 - bool "19200" -config UART9_BAUD_9600 - bool "9600" - -endchoice - -config UART9_BAUD - int - depends on UART9_ENABLE - default 115200 if UART9_BAUD_115200 - default 57600 if UART9_BAUD_57600 - default 38400 if UART9_BAUD_38400 - default 19200 if UART9_BAUD_19200 - default 9600 if UART9_BAUD_9600 # end of UART9
# Begin of UART10 @@ -1526,32 +1292,6 @@ config UART10_IRQ default 14 if UART10_IRQ14 default 15 if UART10_IRQ15
-choice - prompt "UART10 Baud rate" - default UART10_BAUD_115200 - depends on UART10_ENABLE - -config UART10_BAUD_115200 - bool "115200" -config UART10_BAUD_57600 - bool "57600" -config UART10_BAUD_38400 - bool "38400" -config UART10_BAUD_19200 - bool "19200" -config UART10_BAUD_9600 - bool "9600" - -endchoice - -config UART10_BAUD - int - depends on UART10_ENABLE - default 115200 if UART10_BAUD_115200 - default 57600 if UART10_BAUD_57600 - default 38400 if UART10_BAUD_38400 - default 19200 if UART10_BAUD_19200 - default 9600 if UART10_BAUD_9600 # end of UART10
endmenu diff --git a/src/southbridge/dmp/vortex86ex/southbridge.c b/src/southbridge/dmp/vortex86ex/southbridge.c index 146bed7..2a68e4e 100644 --- a/src/southbridge/dmp/vortex86ex/southbridge.c +++ b/src/southbridge/dmp/vortex86ex/southbridge.c @@ -18,7 +18,6 @@ */
#include <console/console.h> -#include <uart8250.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ops.h> @@ -387,8 +386,7 @@ static u32 make_uart_config(u16 base, u8 irq)
#define SETUP_UART(n) \ uart_cfg = make_uart_config(CONFIG_UART##n##_IO, CONFIG_UART##n##_IRQ);\ - outl(uart_cfg, base + (n - 1) * 4);\ - uart8250_init(CONFIG_UART##n##_IO, 115200 / CONFIG_UART##n##_BAUD); + outl(uart_cfg, base + (n - 1) * 4);
static void ex_sb_uart_init(struct device *dev) {