aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cavium-octeon/patches
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-12 12:59:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-05-12 12:59:45 +0000
commitf27feec22f824ff2ab0041aebb3b45852f488929 (patch)
tree8d07822ef89cb30a76cdb7ca738acfb3940ddfbb /target/linux/cavium-octeon/patches
parent214f8bee10f06a41a72d77aac67f08c655cb9b94 (diff)
downloadupstream-f27feec22f824ff2ab0041aebb3b45852f488929.tar.gz
upstream-f27feec22f824ff2ab0041aebb3b45852f488929.tar.bz2
upstream-f27feec22f824ff2ab0041aebb3b45852f488929.zip
update to 2.6.30-rc5
SVN-Revision: 15799
Diffstat (limited to 'target/linux/cavium-octeon/patches')
-rw-r--r--target/linux/cavium-octeon/patches/003_pci_pcie_support.patch6
-rw-r--r--target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch8
-rw-r--r--target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch13
-rw-r--r--target/linux/cavium-octeon/patches/014-clocksource_fixes.patch31
-rw-r--r--target/linux/cavium-octeon/patches/015-no_werror.patch8
5 files changed, 54 insertions, 12 deletions
diff --git a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
index 161b1dcd33..96ff2c2bf0 100644
--- a/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
+++ b/target/linux/cavium-octeon/patches/003_pci_pcie_support.patch
@@ -55,14 +55,16 @@ diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile
index 1c2a7fa..2b5f08f 100644
--- a/arch/mips/cavium-octeon/Makefile
+++ b/arch/mips/cavium-octeon/Makefile
-@@ -14,3 +14,7 @@ obj-y += dma-octeon.o flash_setup.o
+@@ -14,5 +14,9 @@
obj-y += octeon-memcpy.o
-
+
obj-$(CONFIG_SMP) += smp.o
+obj-$(CONFIG_PCI) += pci-common.o
+obj-$(CONFIG_PCI) += pci.o
+obj-$(CONFIG_PCI) += pcie.o
+obj-$(CONFIG_PCI_MSI) += msi.o
+
+ EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index 01b1ef9..af3c26f 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
diff --git a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
index ebac42ef1f..98053105bf 100644
--- a/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
+++ b/target/linux/cavium-octeon/patches/006-octeon_mgmt_driver.patch
@@ -620,14 +620,14 @@ diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4a92305..4cbc22e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -228,6 +228,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
- pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
+@@ -234,6 +234,7 @@
obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
+ obj-$(CONFIG_ETHOC) += ethoc.o
+obj-$(CONFIG_OCTEON_MGMT) += octeon/
-
+
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
-
+
diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile
new file mode 100644
index 0000000..f32f394
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
index f08bc5311e..af2d2b1da9 100644
--- a/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
+++ b/target/linux/cavium-octeon/patches/012-hook_up_eth_driver.patch
@@ -19,10 +19,11 @@ index 0dcf9ca..6c2ca23 100644
+
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/
+diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
+--- a/drivers/staging/Makefile 2009-05-09 02:14:14.000000000 +0200
++++ b/drivers/staging/Makefile 2009-05-12 12:38:22.000000000 +0200
+@@ -40,3 +40,4 @@
+ obj-$(CONFIG_HECI) += heci/
+ obj-$(CONFIG_LINE6_USB) += line6/
+ obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100) += serqt_usb/
+obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
diff --git a/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch
new file mode 100644
index 0000000000..bc72185f28
--- /dev/null
+++ b/target/linux/cavium-octeon/patches/014-clocksource_fixes.patch
@@ -0,0 +1,31 @@
+From: Coly Li <coly.li@suse.de>
+Date: Wed, 22 Apr 2009 19:06:06 +0000 (+0800)
+Subject: MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
+X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=06a4801f5f580bb98dd813466668592943f7baea;hp=bb13f16bff55ce7ffb67d0d600bab72b9cab773b
+
+MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
+
+This patch modifies parameter of octeon_cvmcount_read() from 'void' to
+'struct clocksource *cs', which fixes compile warning for incompatible
+parameter type.
+
+Signed-off-by: Coly Li <coly.li@suse.de>
+Cc: David Daney <ddaney@caviumnetworks.com>
+Cc: Ingo Molnar <mingo@elte.hu>
+Reviewed-by: David Daney <ddaney@caviumnetworks.com>
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+
+diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
+index 70fd92c..96110f2 100644
+--- a/arch/mips/cavium-octeon/csrc-octeon.c
++++ b/arch/mips/cavium-octeon/csrc-octeon.c
+@@ -38,7 +38,7 @@ void octeon_init_cvmcount(void)
+ local_irq_restore(flags);
+ }
+
+-static cycle_t octeon_cvmcount_read(void)
++static cycle_t octeon_cvmcount_read(struct clocksource *cs)
+ {
+ return read_c0_cvmcount();
+ }
diff --git a/target/linux/cavium-octeon/patches/015-no_werror.patch b/target/linux/cavium-octeon/patches/015-no_werror.patch
new file mode 100644
index 0000000000..bb3b517788
--- /dev/null
+++ b/target/linux/cavium-octeon/patches/015-no_werror.patch
@@ -0,0 +1,8 @@
+--- a/arch/mips/cavium-octeon/Makefile 2009-05-12 12:43:52.000000000 +0200
++++ b/arch/mips/cavium-octeon/Makefile 2009-05-12 12:57:04.000000000 +0200
+@@ -18,5 +18,3 @@
+ obj-$(CONFIG_PCI) += pci.o
+ obj-$(CONFIG_PCI) += pcie.o
+ obj-$(CONFIG_PCI_MSI) += msi.o
+-
+-EXTRA_CFLAGS += -Werror