From d73f4eaecc74401181a3b6d194e07fa7e45728a2 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 6 May 2009 19:35:16 +0000
Subject: [PATCH] add missing patches

SVN-Revision: 15641
---
 .../patches/012-hook_up_eth_driver.patch      | 28 ++++++
 .../patches/013-compile_fixes.patch           | 85 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
 create mode 100644 target/linux/cavium-octeon/patches/013-compile_fixes.patch

diff --git a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
new file mode 100644
index 0000000000..f08bc5311e
--- /dev/null
+++ b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
@@ -0,0 +1,28 @@
+The previous patch adds the driver files for octeon-ethernet.  Here we
+hook them up into the main kernel build system.
+
+Signed-off-by: David Daney <ddaney@caviumnetworks.com>
+---
+ drivers/staging/Kconfig  |    2 ++
+ drivers/staging/Makefile |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
+index 0dcf9ca..6c2ca23 100644
+--- a/drivers/staging/Kconfig
++++ b/drivers/staging/Kconfig
+@@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig"
+ 
+ source "drivers/staging/serqt_usb/Kconfig"
+ 
++source "drivers/staging/octeon/Kconfig"
++
+ endif # !STAGING_EXCLUDE_BUILD
+ endif # STAGING
+--- a/drivers/staging/Makefile	2009-05-06 15:46:47.000000000 +0200
++++ b/drivers/staging/Makefile	2009-05-06 15:47:33.000000000 +0200
+@@ -29,3 +29,4 @@
+ obj-$(CONFIG_TRANZPORT)		+= frontier/
+ obj-$(CONFIG_EPL)		+= epl/
+ obj-$(CONFIG_ANDROID)		+= android/
++obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/
diff --git a/target/linux/cavium-octeon/patches/013-compile_fixes.patch b/target/linux/cavium-octeon/patches/013-compile_fixes.patch
new file mode 100644
index 0000000000..8a7d5f0842
--- /dev/null
+++ b/target/linux/cavium-octeon/patches/013-compile_fixes.patch
@@ -0,0 +1,85 @@
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c	2009-05-06 16:55:28.000000000 +0200
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c	2009-05-06 17:04:05.000000000 +0200
+@@ -272,6 +272,7 @@
+  *
+  * Returns Zero on success, negative on failure
+  */
++#if 0
+ int __cvmx_helper_errata_asx_pass1(int interface, int port, int cpu_clock_hz)
+ {
+ 	/* Set hi water mark as per errata GMX-4 */
+@@ -289,6 +290,7 @@
+ 			     cpu_clock_hz);
+ 	return 0;
+ }
++#endif
+ 
+ /**
+  * This function needs to be called on all Octeon chips with
+--- a/arch/mips/include/asm/octeon/cvmx-helper-errata.h	2009-05-06 17:12:16.000000000 +0200
++++ a/arch/mips/include/asm/octeon/cvmx-helper-errata.h	2009-05-06 17:12:10.000000000 +0200
+@@ -60,8 +60,8 @@
+  *
+  * Returns Zero on success, negative on failure
+  */
+-extern int __cvmx_helper_errata_asx_pass1(int interface, int port,
+-					  int cpu_clock_hz);
++//extern int __cvmx_helper_errata_asx_pass1(int interface, int port,
++//					  int cpu_clock_hz);
+ 
+ /**
+  * This function needs to be called on all Octeon chips with
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c	2009-05-06 17:30:47.000000000 +0200
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c	2009-05-06 17:31:01.000000000 +0200
+@@ -356,6 +356,7 @@
+  *
+  * Returns Interface number
+  */
++#if 0
+ int cvmx_helper_get_interface_num(int ipd_port)
+ {
+ 	if (ipd_port < 16)
+@@ -372,6 +373,7 @@
+ 
+ 	return -1;
+ }
++#endif
+ 
+ /**
+  * Returns the interface index number for an IPD/PKO port
+@@ -381,6 +383,7 @@
+  *
+  * Returns Interface index number
+  */
++#if 0
+ int cvmx_helper_get_interface_index_num(int ipd_port)
+ {
+ 	if (ipd_port < 32)
+@@ -395,6 +398,7 @@
+ 
+ 	return -1;
+ }
++#endif
+ 
+ /**
+  * Initialize the internal QLM JTAG logic to allow programming
+--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h	2009-05-06 17:31:46.000000000 +0200
++++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h	2009-05-06 17:27:36.000000000 +0200
+@@ -205,7 +205,7 @@
+  *
+  * Returns Interface number
+  */
+-extern int cvmx_helper_get_interface_num(int ipd_port);
++//extern int cvmx_helper_get_interface_num(int ipd_port);
+ 
+ /**
+  * Returns the interface index number for an IPD/PKO port
+@@ -215,7 +215,7 @@
+  *
+  * Returns Interface index number
+  */
+-extern int cvmx_helper_get_interface_index_num(int ipd_port);
++//extern int cvmx_helper_get_interface_index_num(int ipd_port);
+ 
+ /**
+  * Initialize the internal QLM JTAG logic to allow programming