aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2020-04-17 21:56:37 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-23 18:38:26 +0200
commit655c14e88cc17509bdec71ca73594b345d20d7a1 (patch)
treebc7e97d4eb14bbb9f935fe1f039c6e4c6913ab3d /target
parent91594cb137154c2936853f293db1da19d125d28c (diff)
downloadupstream-655c14e88cc17509bdec71ca73594b345d20d7a1.tar.gz
upstream-655c14e88cc17509bdec71ca73594b345d20d7a1.tar.bz2
upstream-655c14e88cc17509bdec71ca73594b345d20d7a1.zip
octeon: refresh patches for kernel 5.4
Refresh patches to make them apply to kernel 5.4. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> [split patch, refresh on newer kernel, add description] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/octeon/patches-5.4/100-ubnt_edgerouter2_support.patch2
-rw-r--r--target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch4
-rw-r--r--target/linux/octeon/patches-5.4/120-cmdline-hack.patch4
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/octeon/patches-5.4/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-5.4/100-ubnt_edgerouter2_support.patch
index 991eb56ce2..7fdd36e31f 100644
--- a/target/linux/octeon/patches-5.4/100-ubnt_edgerouter2_support.patch
+++ b/target/linux/octeon/patches-5.4/100-ubnt_edgerouter2_support.patch
@@ -20,7 +20,7 @@
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-@@ -173,6 +173,8 @@ int cvmx_helper_board_get_mii_address(in
+@@ -174,6 +174,8 @@ int cvmx_helper_board_get_mii_address(in
return 7 - ipd_port;
else
return -1;
diff --git a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
index 93d1e93505..c1b6f73a30 100644
--- a/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-5.4/110-er200-ethernet_probe_order.patch
@@ -1,6 +1,6 @@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -670,6 +670,7 @@ static int cvm_oct_probe(struct platform
+@@ -682,6 +682,7 @@ static int cvm_oct_probe(struct platform
int interface;
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
int qos;
@@ -8,7 +8,7 @@
struct device_node *pip;
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
-@@ -793,13 +794,19 @@ static int cvm_oct_probe(struct platform
+@@ -805,13 +806,19 @@ static int cvm_oct_probe(struct platform
}
num_interfaces = cvmx_helper_get_number_of_interfaces();
diff --git a/target/linux/octeon/patches-5.4/120-cmdline-hack.patch b/target/linux/octeon/patches-5.4/120-cmdline-hack.patch
index 2b5978c5ee..6c02ea3194 100644
--- a/target/linux/octeon/patches-5.4/120-cmdline-hack.patch
+++ b/target/linux/octeon/patches-5.4/120-cmdline-hack.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
-@@ -651,6 +651,35 @@ void octeon_user_io_init(void)
+@@ -653,6 +653,35 @@ void octeon_user_io_init(void)
write_c0_derraddr1(0);
}
@@ -36,7 +36,7 @@
/**
* Early entry point for arch setup
*/
-@@ -895,6 +924,8 @@ void __init prom_init(void)
+@@ -897,6 +926,8 @@ void __init prom_init(void)
}
}