summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
blob: bc8e7091d5d827e307c76851b1d7a89e2e5cc3c3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
 	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