From: Maksym Kokhan <maksym.kokhan@globallogic.com>
To: Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>
Cc: Daniel Walker <dwalker@fifo99.com>,
Daniel Walker <danielwa@cisco.com>,
Andrii Bordunov <aborduno@cisco.com>,
Ruslan Bilovol <rbilovol@cisco.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/8] drivers: of: ifdef out cmdline section
Date: Thu, 27 Sep 2018 19:55:27 +0300 [thread overview]
Message-ID: <1538067327-5785-1-git-send-email-maksym.kokhan@globallogic.com> (raw)
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
next reply other threads:[~2018-09-27 16:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 16:55 Maksym Kokhan [this message]
2018-09-27 21:07 ` [PATCH 2/8] drivers: of: ifdef out cmdline section Rob Herring
2018-10-08 17:58 ` Maksym Kokhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1538067327-5785-1-git-send-email-maksym.kokhan@globallogic.com \
--to=maksym.kokhan@globallogic.com \
--cc=aborduno@cisco.com \
--cc=danielwa@cisco.com \
--cc=devicetree@vger.kernel.org \
--cc=dwalker@fifo99.com \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rbilovol@cisco.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).