Re: [PATCH v2 3/7] tty/serial: convert 8250 to generic earlycon

From: Rob Herring
Date: Mon Apr 28 2014 - 19:24:16 EST


On Sat, Apr 26, 2014 at 1:29 AM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote:
> On Fri, Apr 18, 2014 at 3:19 PM, Rob Herring <robherring2@xxxxxxxxx> wrote:
>> From: Rob Herring <robh@xxxxxxxxxx>
>>
>> With the generic earlycon infrastructure in place, convert the 8250
>> early console to use it.
>>
>> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
>> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>> Cc: Jiri Slaby <jslaby@xxxxxxx>
>> ---
>> drivers/tty/serial/8250/8250_early.c | 138 ++++-------------------------------
>> drivers/tty/serial/8250/Kconfig | 1 +
>> 2 files changed, 16 insertions(+), 123 deletions(-)
>>
>> diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
>> index c100d63..e83c9db 100644
>> --- a/drivers/tty/serial/8250/8250_early.c
>> +++ b/drivers/tty/serial/8250/8250_early.c
>> @@ -35,18 +35,8 @@
> ...
>> -
>> -int __init setup_early_serial8250_console(char *cmdline)
>
> You removed global function, but still left declaration and calling...
>
> arch/mips/mti-malta/malta-init.c:
> setup_early_serial8250_console(console_string);
> drivers/firmware/pcdp.c: return setup_early_serial8250_console(options);
> include/linux/serial_8250.h:extern int
> setup_early_serial8250_console(char *cmdline);

Thanks for finding these. I missed them in my build tests. This should fix them:

diff --git a/drivers/tty/serial/8250/8250_early.c
b/drivers/tty/serial/8250/8250_early.c
index e83c9db..2094c3b 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -156,6 +156,11 @@ static int __init early_serial8250_setup(struct
earlycon_device *device,
EARLYCON_DECLARE(uart8250, early_serial8250_setup);
EARLYCON_DECLARE(uart, early_serial8250_setup);

+int __init setup_early_serial8250_console(char *cmdline)
+{
+ return setup_earlycon(cmdline, "uart8250", early_serial8250_setup);
+}
+
int serial8250_find_port_for_earlycon(void)
{
struct earlycon_device *device = early_device;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/