--- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -935,6 +935,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 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -50,6 +50,9 @@ void * __init early_init_dt_alloc_memory void __init __dt_setup_arch(void *bph) { + if (boot_command_line[0] == '\0') + strcpy(boot_command_line, arcs_cmdline); + if (!early_init_dt_scan(bph)) return; method='get'> upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/cfe-bin-header.py
blob: 3bf652bd0ac59a81e11324618b6b4e18a943e613 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72