target/octeon: Add Linux 4.19 support

[openwrt/staging/blogic.git] / target / linux / octeon / patches-4.19 / 120-cmdline-hack.patch

diff --git a/target/linux/octeon/patches-4.19/120-cmdline-hack.patch b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
new file mode 100644 (file)
index 0000000..e902e85
--- /dev/null
+++ b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
@@ -0,0 +1,47 @@
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -650,6 +650,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
+  */
+@@ -894,6 +923,8 @@ void __init prom_init(void)
+               }
+       }
+ 
++      octeon_use_image_cmdline();
++
+       if (strstr(arcs_cmdline, "console=") == NULL) {
+               if (octeon_uart == 1)
+                       strcat(arcs_cmdline, " console=ttyS1,115200");