aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-2.6.30/013-compile_fixes.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-02-04 10:10:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-02-04 10:10:45 +0000
commit7b56fb6337756ff7cb07dec09420da7026d7d3e3 (patch)
treed45f59e7512a199eaadbb25303051dbb6f160d23 /target/linux/octeon/patches-2.6.30/013-compile_fixes.patch
parentdc192096e9ac454520fd1aec7ab58a34fa42d02c (diff)
downloadupstream-7b56fb6337756ff7cb07dec09420da7026d7d3e3.tar.gz
upstream-7b56fb6337756ff7cb07dec09420da7026d7d3e3.tar.bz2
upstream-7b56fb6337756ff7cb07dec09420da7026d7d3e3.zip
move generic config and patches directory to be 2.6.30 specific
SVN-Revision: 19513
Diffstat (limited to 'target/linux/octeon/patches-2.6.30/013-compile_fixes.patch')
-rw-r--r--target/linux/octeon/patches-2.6.30/013-compile_fixes.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-2.6.30/013-compile_fixes.patch b/target/linux/octeon/patches-2.6.30/013-compile_fixes.patch
new file mode 100644
index 0000000000..89338f4e8f
--- /dev/null
+++ b/target/linux/octeon/patches-2.6.30/013-compile_fixes.patch
@@ -0,0 +1,85 @@
+--- a/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
+@@ -272,6 +272,7 @@ fix_ipd_exit:
+ *
+ * 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 @@ int __cvmx_helper_errata_asx_pass1(int i
+ 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
++++ b/arch/mips/include/asm/octeon/cvmx-helper-errata.h
+@@ -60,8 +60,8 @@ extern int __cvmx_helper_errata_fix_ipd_
+ *
+ * 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
++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+@@ -356,6 +356,7 @@ int cvmx_helper_get_ipd_port(int interfa
+ *
+ * Returns Interface number
+ */
++#if 0
+ int cvmx_helper_get_interface_num(int ipd_port)
+ {
+ if (ipd_port < 16)
+@@ -372,6 +373,7 @@ int cvmx_helper_get_interface_num(int ip
+
+ return -1;
+ }
++#endif
+
+ /**
+ * Returns the interface index number for an IPD/PKO port
+@@ -381,6 +383,7 @@ int cvmx_helper_get_interface_num(int ip
+ *
+ * Returns Interface index number
+ */
++#if 0
+ int cvmx_helper_get_interface_index_num(int ipd_port)
+ {
+ if (ipd_port < 32)
+@@ -395,6 +398,7 @@ int cvmx_helper_get_interface_index_num(
+
+ return -1;
+ }
++#endif
+
+ /**
+ * Initialize the internal QLM JTAG logic to allow programming
+--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
++++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
+@@ -205,7 +205,7 @@ static inline void cvmx_helper_free_pack
+ *
+ * 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 @@ extern int cvmx_helper_get_interface_num
+ *
+ * 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