aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-4.19
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/octeon/patches-4.19')
-rw-r--r--target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch4
-rw-r--r--target/linux/octeon/patches-4.19/120-cmdline-hack.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch
index 6b1eaf92a2..93d1e93505 100644
--- a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch
+++ b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch
@@ -1,6 +1,6 @@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
+@@ -670,6 +670,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;
-@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
+@@ -793,13 +794,19 @@ static int cvm_oct_probe(struct platform
}
num_interfaces = cvmx_helper_get_number_of_interfaces();
diff --git a/target/linux/octeon/patches-4.19/120-cmdline-hack.patch b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
index e902e853e8..2b5978c5ee 100644
--- a/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
+++ b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
-@@ -650,6 +650,35 @@ void octeon_user_io_init(void)
+@@ -651,6 +651,35 @@ void octeon_user_io_init(void)
write_c0_derraddr1(0);
}
@@ -36,7 +36,7 @@
/**
* Early entry point for arch setup
*/
-@@ -894,6 +923,8 @@ void __init prom_init(void)
+@@ -895,6 +924,8 @@ void __init prom_init(void)
}
}