diff mbox series

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

Message ID 1538067327-5785-1-git-send-email-maksym.kokhan@globallogic.com
State Under Review, archived
Headers show
Series add generic builtin command line | expand

Checks

Context Check Description
robh/checkpatch success

Commit Message

Maksym Kokhan Sept. 27, 2018, 4:55 p.m. UTC 
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(-)

Comments

Rob Herring Sept. 27, 2018, 9:07 p.m. UTC | #1 
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
Maksym Kokhan Oct. 8, 2018, 5:58 p.m. UTC | #2 
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
diff mbox series

Patch

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);