From 7c7586b6d05926f2d9538dbd9fce9d31df706caa Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 10 Jan 2018 14:06:52 +0000 Subject: kernel: bump 4.14 to 4.14.13 Refresh patches Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/octeon/patches-4.14/160-cmdline-hack.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '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 2a4ad1d..e902e85 100644 --- 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"); -- cgit v1.1