diff options
| author | David Howells <dhowells@redhat.com> | 2006-01-08 01:01:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:13:38 -0800 |
| commit | f8aec7573b87d2bc09cafab459476953353d2efa (patch) | |
| tree | d2d988ebed735c059242181e54d3407b37dae93f /arch/frv | |
| parent | 7a758313905f8b085b4591e8838626274e88b969 (diff) | |
| download | talos-obmc-linux-f8aec7573b87d2bc09cafab459476953353d2efa.tar.gz talos-obmc-linux-f8aec7573b87d2bc09cafab459476953353d2efa.zip | |
[PATCH] frv: force serial driver inclusion
Force the 8230 serial driver to be built in if the on-CPU UARTs are to be
used. It can't be used as a module because the arch setup needs to call into
it.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/Kconfig | 5 | ||||
| -rw-r--r-- | arch/frv/kernel/setup.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 3516a3aee820..61261b78ced7 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -274,6 +274,11 @@ config GPREL_DATA_NONE endchoice +config FRV_ONCPU_SERIAL + bool "Use on-CPU serial ports" + select SERIAL_8250 + default y + config PCI bool "Use PCI" depends on MB93090_MB00 diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 767ebb55bd83..5908deae9607 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -787,6 +787,7 @@ void __init setup_arch(char **cmdline_p) #endif /* register those serial ports that are available */ +#ifdef CONFIG_FRV_ONCPU_SERIAL #ifndef CONFIG_GDBSTUB_UART0 __reg(UART0_BASE + UART_IER * 8) = 0; early_serial_setup(&__frv_uart0); @@ -795,6 +796,7 @@ void __init setup_arch(char **cmdline_p) __reg(UART1_BASE + UART_IER * 8) = 0; early_serial_setup(&__frv_uart1); #endif +#endif #if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH) /* we need to initialize the Flashrom device here since we might |
