From: Daniel Walker <danielwa@cisco.com>
To: xe-kernel@external.cisco.com, Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>
Cc: Daniel Walker <dwalker@fifo99.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH-RFC 6/7] drivers: of: ifdef out cmdline section
Date: Tue, 6 Oct 2015 08:47:13 -0700 [thread overview]
Message-ID: <1444146434-12776-6-git-send-email-danielwa@cisco.com> (raw)
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: xe-kernel@external.cisco.com
Cc: Daniel Walker <dwalker@fifo99.com>
Signed-off-by: Daniel Walker <danielwa@cisco.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 6e82bc42..80f1e48 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -953,7 +953,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)
#ifndef CONFIG_CMDLINE_FORCE
if (!((char *)data)[0])
#endif
--
2.1.4
next reply other threads:[~2015-10-06 15:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 15:47 Daniel Walker [this message]
2015-10-06 17:14 ` [PATCH-RFC 6/7] drivers: of: ifdef out cmdline section Rob Herring
2015-10-07 16:27 ` dwalker
2015-10-07 21:48 ` Rob Herring
2015-10-13 20:13 ` Daniel Walker
2015-10-13 21:17 ` Rob Herring
2015-10-14 14:48 ` Daniel Walker
2015-10-14 17:57 ` Rob Herring
2015-10-14 19:16 ` Daniel Walker
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=1444146434-12776-6-git-send-email-danielwa@cisco.com \
--to=danielwa@cisco.com \
--cc=devicetree@vger.kernel.org \
--cc=dwalker@fifo99.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=xe-kernel@external.cisco.com \
/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).