diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-10 14:06:52 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-11 20:34:33 +0100 |
| commit | 7c7586b6d05926f2d9538dbd9fce9d31df706caa (patch) | |
| tree | 877c2b947b5a0641ca9d6ac27b59f4dac0d48903 /target/linux/octeon/patches-4.14/160-cmdline-hack.patch | |
| parent | eceff9ea8f6392132c1fef74f5b822c28a5f24ec (diff) | |
| download | upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.tar.gz upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.tar.bz2 upstream-7c7586b6d05926f2d9538dbd9fce9d31df706caa.zip | |
kernel: bump 4.14 to 4.14.13
Refresh patches
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/octeon/patches-4.14/160-cmdline-hack.patch')
| -rw-r--r-- | target/linux/octeon/patches-4.14/160-cmdline-hack.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 2a4ad1dc73..e902e853e8 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"); |