OpenWrt – Blame information for rev 4
?pathlinks?
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 4 | office | 1 | --- a/arch/mips/cavium-octeon/setup.c |
| 2 | +++ b/arch/mips/cavium-octeon/setup.c |
||
| 3 | @@ -656,6 +656,35 @@ void octeon_user_io_init(void) |
||
| 4 | write_c0_derraddr1(0); |
||
| 5 | } |
||
| 6 | |||
| 7 | +#ifdef CONFIG_IMAGE_CMDLINE_HACK |
||
| 8 | +extern char __image_cmdline[]; |
||
| 9 | + |
||
| 10 | +static int __init octeon_use_image_cmdline(void) |
||
| 11 | +{ |
||
| 12 | + char *p = __image_cmdline; |
||
| 13 | + int replace = 0; |
||
| 14 | + |
||
| 15 | + if (*p == '-') { |
||
| 16 | + replace = 1; |
||
| 17 | + p++; |
||
| 18 | + } |
||
| 19 | + |
||
| 20 | + if (*p == '\0') |
||
| 21 | + return 0; |
||
| 22 | + |
||
| 23 | + if (replace) { |
||
| 24 | + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline)); |
||
| 25 | + } else { |
||
| 26 | + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); |
||
| 27 | + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); |
||
| 28 | + } |
||
| 29 | + |
||
| 30 | + return 1; |
||
| 31 | +} |
||
| 32 | +#else |
||
| 33 | +static inline int octeon_use_image_cmdline(void) { return 0; } |
||
| 34 | +#endif |
||
| 35 | + |
||
| 36 | /** |
||
| 37 | * Early entry point for arch setup |
||
| 38 | */ |
||
| 39 | @@ -900,6 +929,8 @@ void __init prom_init(void) |
||
| 40 | } |
||
| 41 | } |
||
| 42 | |||
| 43 | + octeon_use_image_cmdline(); |
||
| 44 | + |
||
| 45 | if (strstr(arcs_cmdline, "console=") == NULL) { |
||
| 46 | #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL |
||
| 47 | strcat(arcs_cmdline, " console=ttyS0,115200"); |