1 --- a/arch/mips/cavium-octeon/setup.c
2 +++ b/arch/mips/cavium-octeon/setup.c
3 @@ -611,6 +611,35 @@ void octeon_user_io_init(void)
7 +#ifdef CONFIG_IMAGE_CMDLINE_HACK
8 +extern char __image_cmdline[];
10 +static int __init octeon_use_image_cmdline(void)
12 + char *p = __image_cmdline;
24 + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
26 + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
27 + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
33 +static inline int octeon_use_image_cmdline(void) { return 0; }
37 * Early entry point for arch setup
39 @@ -842,6 +871,8 @@ void __init prom_init(void)
43 + octeon_use_image_cmdline();
45 if (strstr(arcs_cmdline, "console=") == NULL) {
46 #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
47 strcat(arcs_cmdline, " console=ttyS0,115200");