domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 4.14 to 4.14.13

Browse Source 
Refresh patches

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant
2018-01-10 14:06:52 +00:00
committed by Hauke Mehrtens
parent eceff9ea8f
commit 7c7586b6d0
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
View File

@@ -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();

8
target/linux/octeon/patches-4.14/160-cmdline-hack.patch
View File

@@ -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");

2
target/linux/octeon/patches-4.14/170-cisco-hack.patch
View File

@@ -18,7 +18,7 @@ Signed-off-by: Michał Osowiecki <michal.osowiecki@gmail.com>
--- 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;