Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8aec757 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7a758313

arch/frv/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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

arch/frv/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -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