kernel: bump 4.14 to 4.14.13
Refresh patches Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
committed by
Hauke Mehrtens
parent
eceff9ea8f
commit
7c7586b6d0
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user