The patch titled
Subject: drivers: of: generic command line support
has been added to the -mm tree. Its filename is
drivers-of-generic-command-line-support.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/drivers-of-generic-command-line-support.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/drivers-of-generic-command-line-support.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Daniel Walker <danielwa@xxxxxxxxx>
Subject: drivers: of: generic command line support
This adds support for the generic command line implementation into the
device tree code. This allows some platforms to use the original
CONFIG_CMDLINE implementation, but powerpc platforms can used the newer
generic command line code. As platforms support the generic command line
code they can simply add "select GENERIC_CMDLINE" and delete their
Kconfig options for the current CMDLINE.
Link: http://lkml.kernel.org/r/20190319232448.45964-3-danielwa@xxxxxxxxx
Signed-off-by: Daniel Walker <danielwa@xxxxxxxxx>
Cc: Christophe Leroy <christophe.leroy@xxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Frank Rowand <frowand.list@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Daniel Walker <dwalker@xxxxxxxxxx>
Cc: Maksym Kokhan <maksym.kokhan@xxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Rob Herring <robh+dt@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/drivers/of/fdt.c~drivers-of-generic-command-line-support
+++ a/drivers/of/fdt.c
@@ -24,6 +24,7 @@
#include <linux/debugfs.h>
#include <linux/serial_core.h>
#include <linux/sysfs.h>
+#include <linux/cmdline.h>
#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
#include <asm/page.h>
@@ -1098,7 +1099,7 @@ int __init early_init_dt_scan_chosen(uns
* 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);
@@ -1109,7 +1110,12 @@ int __init early_init_dt_scan_chosen(uns
if (!((char *)data)[0])
strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
#endif
-#endif /* CONFIG_CMDLINE */
+#endif /* CONFIG_CMDLINE && !CONFIG_GENERIC_CMDLINE */
+
+ /* append and prepend any arguments built into the kernel via
+ * generic cmdline.
+ */
+ cmdline_add_builtin(data, NULL, COMMAND_LINE_SIZE);
pr_debug("Command line is: %s\n", (char*)data);
_
Patches currently in -mm which might be from danielwa@xxxxxxxxx are
add-generic-builtin-command-line.patch
drivers-of-generic-command-line-support.patch
powerpc-convert-to-generic-builtin-command-line.patch
powerpc-convert-config-files-to-generic-cmdline.patch
