aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-01-10 14:06:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-11 20:34:33 +0100
commit7c7586b6d05926f2d9538dbd9fce9d31df706caa (patch)
tree877c2b947b5a0641ca9d6ac27b59f4dac0d48903 /target/linux/octeon
parenteceff9ea8f6392132c1fef74f5b822c28a5f24ec (diff)
downloadupstream-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')
-rw-r--r--target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch6
-rw-r--r--target/linux/octeon/patches-4.14/160-cmdline-hack.patch8
-rw-r--r--target/linux/octeon/patches-4.14/170-cisco-hack.patch2
3 files changed, 8 insertions, 8 deletions
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 1df3f6a675..6b1eaf92a2 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 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");
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 124bcfd7a7..72774209dc 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 <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;