drivers: of: generic command line support
PATCH 2/4 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.
Change-Id Ief473a5ffac01a999b0aba7619f5b63bc4b36ac4
Cc Andrew Morton <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Michael Ellerman <[email protected]>
Signed-off-by Daniel Walker <[email protected]>
--- drivers/of/fdt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/of/fdt.c +8 -2
@@ -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>
@@ -1102,7 +1103,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 );
@@ -1113,7 +1114,12 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,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);
Signature · 1 line
2.19.1