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 --- .../octeon/patches-4.14/110-er200-ethernet_probe_order.patch | 6 +++--- target/linux/octeon/patches-4.14/160-cmdline-hack.patch | 8 ++++---- target/linux/octeon/patches-4.14/170-cisco-hack.patch | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/octeon') diff --git a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch index 1df3f6a..6b1eaf9 100644 --- a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch @@ -1,14 +1,14 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -684,6 +684,7 @@ static int cvm_oct_probe(struct platform +@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; + int i; struct device_node *pip; + int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; - octeon_mdiobus_force_mod_depencency(); -@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform +@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); 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"); diff --git a/target/linux/octeon/patches-4.14/170-cisco-hack.patch b/target/linux/octeon/patches-4.14/170-cisco-hack.patch index 124bcfd..7277420 100644 --- a/target/linux/octeon/patches-4.14/170-cisco-hack.patch +++ b/target/linux/octeon/patches-4.14/170-cisco-hack.patch @@ -18,7 +18,7 @@ Signed-off-by: Michał Osowiecki --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -1005,6 +1005,10 @@ void __init plat_mem_setup(void) +@@ -1018,6 +1018,10 @@ void __init plat_mem_setup(void) if (mem_alloc_size > max_memory) mem_alloc_size = max_memory; -- cgit v1.1