--- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -656,6 +656,35 @@ void octeon_user_io_init(void) write_c0_derraddr1(0); } +#ifdef CONFIG_IMAGE_CMDLINE_HACK +extern char __image_cmdline[]; + +static int __init octeon_use_image_cmdline(void) +{ + char *p = __image_cmdline; + int replace = 0; + + if (*p == '-') { + replace = 1; + p++; + } + + if (*p == '\0') + return 0; + + if (replace) { + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline)); + } else { + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); + } + + return 1; +} +#else +static inline int octeon_use_image_cmdline(void) { return 0; } +#endif + /** * Early entry point for arch setup */ @@ -900,6 +929,8 @@ void __init prom_init(void) } } + octeon_use_image_cmdline(); + if (strstr(arcs_cmdline, "console=") == NULL) { #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL strcat(arcs_cmdline, " console=ttyS0,115200"); arrier_breaker'>barrier_breaker upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.19/207-disable-modorder.patch
blob: cf38cd32453e6ad71f7400a3635739195bc15ea7 (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