of/fdt: extend cmdline is not avail when kernel grub config ends with "--"
PATCH 1/1 of/fdt: extend cmdline is not avail when kernel grub config ends with "--"
when boot_command_line = boot-command "--" CONFIG_CMDLINE, parse_args() will exit and without parsing the contents of CONFIG_CMDLINE
Signed-off-by hmy <[email protected]>
--- drivers/of/fdt.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/of/fdt.c +4 -0
@@ -1160,6 +1160,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) {int l, node;const char *p; +char *q;const void *rng_seed;const void *fdt = initial_boot_params;
@@ -1186,6 +1187,9 @@ int __init early_init_dt_scan_chosen(char *cmdline)*/ #ifdef CONFIG_CMDLINE #if defined(CONFIG_CMDLINE_EXTEND ) + q =strstr (cmdline,"--" ); +if (q) + *q ='\0' ;strlcat (cmdline," " ,COMMAND_LINE_SIZE );strlcat (cmdline,CONFIG_CMDLINE ,COMMAND_LINE_SIZE );#elif defined(CONFIG_CMDLINE_FORCE )
Signature · 1 line
2.20.1