Hi Greg,

On Fri, Sep 9, 2016 at 3:10 AM, Greg Ungerer <[email protected]> wrote:
> --- a/arch/m68k/include/asm/bootinfo.h
> +++ b/arch/m68k/include/asm/bootinfo.h
> @@ -22,6 +22,10 @@ extern void save_bootinfo(const struct bi_record *bi);
>  static inline void save_bootinfo(const struct bi_record *bi) {}
>  #endif
>
> +#ifdef CONFIG_UBOOT
> +void process_uboot_commandline(char *commandp, int size);
> +#endif

What about providing a dummy for the !CONFIG_UBOOT case..

> --- a/arch/m68k/kernel/setup_mm.c
> +++ b/arch/m68k/kernel/setup_mm.c
> @@ -274,6 +274,9 @@ void __init setup_arch(char **cmdline_p)
>         strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);
>         m68k_command_line[CL_SIZE - 1] = 0;
>  #endif /* CONFIG_BOOTPARAM */
> +#if defined(CONFIG_UBOOT)
> +       process_uboot_commandline(&m68k_command_line[0], CL_SIZE);
> +#endif

... so you can drop the #if and #endif here?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to