Messages in this thread Patch in this message | | | From | Daniel Walker <> | Subject | [PATCH-RFC 6/7] drivers: of: ifdef out cmdline section | Date | Tue, 6 Oct 2015 08:47:13 -0700 |
| |
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
| |