[PATCH 2/8] drivers: of: ifdef out cmdline section

[PATCH 2/8] drivers: of: ifdef out cmdline section

[Maksym Kokhan]

From: Daniel Walker <danielwa@cisco.com>

It looks like there's some seepage of cmdline stuff into
the generic device tree code. This conflicts with the
generic cmdline implementation so I remove it in the case
when that's enabled.

Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Daniel Walker <danielwa@cisco.com>
Signed-off-by: Daniel Walker <danielwa@cisco.com>
Signed-off-by: Maksym Kokhan <maksym.kokhan@globallogic.com>
---
 drivers/of/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 800ad25..74b85ad 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1096,7 +1096,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
 	 * managed to set the command line, unless CONFIG_CMDLINE_FORCE
 	 * is set in which case we override whatever was found earlier.
 	 */
-#ifdef CONFIG_CMDLINE
+#if defined(CONFIG_CMDLINE) && !defined(CONFIG_GENERIC_CMDLINE)
 #if defined(CONFIG_CMDLINE_EXTEND)
 	strlcat(data, " ", COMMAND_LINE_SIZE);
 	strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
-- 
2.7.4

Re: [PATCH 2/8] drivers: of: ifdef out cmdline section

[Rob Herring]

On Thu, Sep 27, 2018 at 11:55 AM Maksym Kokhan
<maksym.kokhan@globallogic.com> wrote:
>
> From: Daniel Walker <danielwa@cisco.com>
>
> It looks like there's some seepage of cmdline stuff into
> the generic device tree code. This conflicts with the
> generic cmdline implementation so I remove it in the case
> when that's enabled.

What's preventing removing this or simplifying the DT code to just be
"give me the cmdline data from DT" and the common code deals with all
the combinations of config options.

Rob

Re: [PATCH 2/8] drivers: of: ifdef out cmdline section

[Maksym Kokhan]

Hi, Rob

On Fri, Sep 28, 2018 at 12:07 AM Rob Herring <robh+dt@kernel.org> wrote:
>
> On Thu, Sep 27, 2018 at 11:55 AM Maksym Kokhan
> <maksym.kokhan@globallogic.com> wrote:
> >
> > From: Daniel Walker <danielwa@cisco.com>
> >
> > It looks like there's some seepage of cmdline stuff into
> > the generic device tree code. This conflicts with the
> > generic cmdline implementation so I remove it in the case
> > when that's enabled.
>
> What's preventing removing this or simplifying the DT code to just be
> "give me the cmdline data from DT" and the common code deals with all
> the combinations of config options.

This code (handling built-in cmdline in old, non-generic way) is used by
some other architectures besides those, modified in our patches, so for
now we can't remove it.

Thanks,
Maksym