--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
-@@ -954,22 +954,38 @@ int __init early_init_dt_scan_chosen(uns
+@@ -954,19 +954,38 @@ int __init early_init_dt_scan_chosen(uns
/* Retrieve command line */
p = of_get_flat_dt_prop(node, "bootargs", &l);
- if (p != NULL && l > 0)
- strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
-- p = of_get_flat_dt_prop(node, "bootargs-append", &l);
-- if (p != NULL && l > 0)
-- strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else