kernel: bump 4.14 to 4.14.13

[openwrt/openwrt.git] / target / linux / octeon / patches-4.14 / 160-cmdline-hack.patch

diff --git a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
index 2a4ad1dc73a1c6355839f895cc13938851a56a10..e902e853e820fd69d91016d5726fd0ae1894f1fa 100644 (file)
--- a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
+++ b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/cavium-octeon/setup.c
 +++ b/arch/mips/cavium-octeon/setup.c
-@@ -656,6 +656,35 @@ void octeon_user_io_init(void)
+@@ -650,6 +650,35 @@ void octeon_user_io_init(void)
        write_c0_derraddr1(0);
  }
  
@@ -36,12 +36,12 @@
  /**
   * Early entry point for arch setup
   */
-@@ -900,6 +929,8 @@ void __init prom_init(void)
+@@ -894,6 +923,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");
+               if (octeon_uart == 1)
+                       strcat(arcs_cmdline, " console=ttyS1,115200");