[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>
This commit is contained in:
parent
7a75831390
commit
f8aec7573b
2 changed files with 7 additions and 0 deletions
|
@ -274,6 +274,11 @@ config GPREL_DATA_NONE
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
config FRV_ONCPU_SERIAL
|
||||||
|
bool "Use on-CPU serial ports"
|
||||||
|
select SERIAL_8250
|
||||||
|
default y
|
||||||
|
|
||||||
config PCI
|
config PCI
|
||||||
bool "Use PCI"
|
bool "Use PCI"
|
||||||
depends on MB93090_MB00
|
depends on MB93090_MB00
|
||||||
|
|
|
@ -787,6 +787,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* register those serial ports that are available */
|
/* register those serial ports that are available */
|
||||||
|
#ifdef CONFIG_FRV_ONCPU_SERIAL
|
||||||
#ifndef CONFIG_GDBSTUB_UART0
|
#ifndef CONFIG_GDBSTUB_UART0
|
||||||
__reg(UART0_BASE + UART_IER * 8) = 0;
|
__reg(UART0_BASE + UART_IER * 8) = 0;
|
||||||
early_serial_setup(&__frv_uart0);
|
early_serial_setup(&__frv_uart0);
|
||||||
|
@ -795,6 +796,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
__reg(UART1_BASE + UART_IER * 8) = 0;
|
__reg(UART1_BASE + UART_IER * 8) = 0;
|
||||||
early_serial_setup(&__frv_uart1);
|
early_serial_setup(&__frv_uart1);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
|
#if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH)
|
||||||
/* we need to initialize the Flashrom device here since we might
|
/* we need to initialize the Flashrom device here since we might
|
||||||
|
|
Loading…
Reference in a new issue