summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-13 17:16:22 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2014-04-09 11:24:43 +0200
commitafa7b13b9355b3df3da7606d434cb8b450316ab9 (patch)
tree6f6a712a477b2be52f353eb2e7db69c587914325 /src/mainboard
parentbbf6f3d384caf25efdfeca0fc5eaac13319a6a43 (diff)
downloadcoreboot-afa7b13b9355b3df3da7606d434cb8b450316ab9.tar.xz
uart: Redefine Kconfig options
Option DRIVERS_UART builds with support for UART hardware. Option CONSOLE_SERIAL enables the console output for UART. Those x86 boards that do not have serial port on SuperIO should select NO_UART_ON_SUPERIO to disable 8250 UART for the default configuration. Removes: CONSOLE_SERIAL_UART HAVE_UART_IO_MAPPED HAVE_UART_MEMORY_MAPPED Renames: CONSOLE_SERIAL8250 -> DRIVERS_UART_8250IO CONSOLE_SERIAL8250MEM -> DRIVERS_UART_8250MEM Change-Id: Id3afa05f85c0d6849746886db8b6c2ed6c846b61 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5311 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/emulation/qemu-armv7/Kconfig2
-rw-r--r--src/mainboard/samsung/lumpy/romstage.c4
-rw-r--r--src/mainboard/samsung/stumpy/romstage.c4
-rw-r--r--src/mainboard/ti/beaglebone/Kconfig4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index edba627984..040ed9cb4b 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -50,7 +50,7 @@ config DRAM_SIZE_MB
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on CONSOLE_SERIAL
default 0x10009000
# Memory map for qemu vexpress-a9:
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index 993345958d..55c1f0a21f 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -40,7 +40,7 @@
#include <cpu/x86/msr.h>
#include "option_table.h"
#include "gpio.h"
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_DRIVERS_UART_8250IO
#include "superio/smsc/lpc47n207/lpc47n207.h"
#include "superio/smsc/lpc47n207/early_serial.c"
#endif
@@ -53,7 +53,7 @@ static void pch_enable_lpc(void)
/* Set COM1/COM2 decode range */
pci_write_config16(PCH_LPC_DEV, LPC_IO_DEC, 0x0010);
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_DRIVERS_UART_8250IO
/* Enable SuperIO + EC + KBC + COM1 + lpc47n207 config*/
pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | MC_LPC_EN |
KBC_LPC_EN | CNF2_LPC_EN | COMA_LPC_EN);
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index e5b55b5059..3e27a6adfb 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -40,7 +40,7 @@
#include <cpu/x86/bist.h>
#include <cpu/x86/msr.h>
#include "gpio.h"
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_DRIVERS_UART_8250IO
#include "superio/smsc/lpc47n207/lpc47n207.h"
#include "superio/smsc/lpc47n207/early_serial.c"
#endif
@@ -62,7 +62,7 @@ static void pch_enable_lpc(void)
/* Set COM1/COM2 decode range */
pci_write_config16(PCH_LPC_DEV, LPC_IO_DEC, 0x0010);
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_DRIVERS_UART_8250IO
/* Enable SuperIO + PS/2 Keyboard/Mouse + COM1 + lpc47n207 config*/
pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | KBC_LPC_EN |\
CNF2_LPC_EN | COMA_LPC_EN);
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index df7ebeb5b3..c842a5d59a 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -64,7 +64,7 @@ config CBFS_HEADER_ROM_OFFSET
choice CONSOLE_SERIAL_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_UART0
- depends on CONSOLE_SERIAL_UART
+ depends on CONSOLE_SERIAL
config CONSOLE_SERIAL_UART0
bool "UART0"
@@ -100,7 +100,7 @@ endchoice
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on CONSOLE_SERIAL
default 0x44e09000 if CONSOLE_SERIAL_UART0
default 0x48022000 if CONSOLE_SERIAL_UART1
default 0x48024000 if CONSOLE_SERIAL_UART2