aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-13 19:28:29 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-13 19:28:29 +0000
commit81e2f00367f4bda39d5cbc832c04bbe0e5984591 (patch)
treebf00006704ea7bb43287237f1c8fe6b9f7976160 /target
parent551a250e5853d3aecd82f04b063515bffed9f4d0 (diff)
downloadupstream-81e2f00367f4bda39d5cbc832c04bbe0e5984591.tar.gz
upstream-81e2f00367f4bda39d5cbc832c04bbe0e5984591.tar.bz2
upstream-81e2f00367f4bda39d5cbc832c04bbe0e5984591.zip
kernel: update kernel to 3.10.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38384
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar7/Makefile2
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/avr32/Makefile2
-rw-r--r--target/linux/bcm53xx/Makefile2
-rw-r--r--target/linux/brcm2708/Makefile2
-rw-r--r--target/linux/brcm47xx/Makefile2
-rw-r--r--target/linux/brcm63xx/Makefile2
-rw-r--r--target/linux/cns21xx/Makefile2
-rw-r--r--target/linux/generic/patches-3.10/770-bgmac-backport.patch15
-rw-r--r--target/linux/imx23/Makefile2
-rw-r--r--target/linux/imx6/Makefile2
-rw-r--r--target/linux/ixp4xx/Makefile2
-rw-r--r--target/linux/lantiq/Makefile2
-rw-r--r--target/linux/malta/Makefile2
-rw-r--r--target/linux/mpc85xx/Makefile2
-rw-r--r--target/linux/mvebu/Makefile2
-rw-r--r--target/linux/octeon/Makefile2
-rw-r--r--target/linux/ppc40x/Makefile2
-rw-r--r--target/linux/ppc44x/Makefile2
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/rb532/Makefile2
-rw-r--r--target/linux/realview/Makefile2
-rw-r--r--target/linux/xburst/Makefile2
23 files changed, 24 insertions, 35 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index fc383f8c79..8601dd0219 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
SUBTARGETS:=generic ac49x
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index cabcf04641..0c99c08ba1 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16
CPU_TYPE=34kc
SUBTARGETS:=generic nand
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index a7387e3fd0..8992c4356c 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index c39c0205e5..4ebacd06c1 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -14,7 +14,7 @@ MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfp
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
index 0bd3f2fb43..d652184756 100644
--- a/target/linux/brcm2708/Makefile
+++ b/target/linux/brcm2708/Makefile
@@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org>
CPU_TYPE:=arm1176jzf-s
CPU_SUBTYPE:=vfp
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 3ad04fe9a5..f95562274e 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index f4aa477b31..1fb2edf297 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx
SUBTARGETS:=generic smp
FEATURES:=squashfs usb atm pci pcmcia
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index 8568323c90..f010d5a3d7 100644
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
FEATURES:=squashfs
CPU_TYPE:=fa526
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic/patches-3.10/770-bgmac-backport.patch b/target/linux/generic/patches-3.10/770-bgmac-backport.patch
index 3651be70cd..99415a6d75 100644
--- a/target/linux/generic/patches-3.10/770-bgmac-backport.patch
+++ b/target/linux/generic/patches-3.10/770-bgmac-backport.patch
@@ -163,13 +163,11 @@ patches for bgmac backported from net-next/master
ring->num_slots * sizeof(struct bgmac_dma_desc));
ring->start = 0;
-@@ -908,10 +934,10 @@ static void bgmac_chip_reset(struct bgma
- struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc;
+@@ -909,9 +935,9 @@ static void bgmac_chip_reset(struct bgma
u8 et_swtype = 0;
u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
-- BGMAC_CHIPCTL_1_IF_TYPE_RMII;
+ BGMAC_CHIPCTL_1_IF_TYPE_MII;
- char buf[2];
-+ BGMAC_CHIPCTL_1_IF_TYPE_MII;
+ char buf[4];
- if (bcm47xx_nvram_getenv("et_swtype", buf, 1) > 0) {
@@ -188,15 +186,6 @@ patches for bgmac backported from net-next/master
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -333,7 +333,7 @@
-
- #define BGMAC_CHIPCTL_1_IF_TYPE_MASK 0x00000030
- #define BGMAC_CHIPCTL_1_IF_TYPE_RMII 0x00000000
--#define BGMAC_CHIPCTL_1_IF_TYPE_MI 0x00000010
-+#define BGMAC_CHIPCTL_1_IF_TYPE_MII 0x00000010
- #define BGMAC_CHIPCTL_1_IF_TYPE_RGMII 0x00000020
- #define BGMAC_CHIPCTL_1_SW_TYPE_MASK 0x000000C0
- #define BGMAC_CHIPCTL_1_SW_TYPE_EPHY 0x00000000
@@ -384,6 +384,8 @@ struct bgmac_dma_ring {
u16 mmio_base;
struct bgmac_dma_desc *cpu_base;
diff --git a/target/linux/imx23/Makefile b/target/linux/imx23/Makefile
index fd4ffb24b9..9195c2c95d 100644
--- a/target/linux/imx23/Makefile
+++ b/target/linux/imx23/Makefile
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
CPU_TYPE:=arm926ej-s
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
KERNELNAME:="zImage dtbs"
define Target/Description
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index 3af424e64c..4a9bc8cb3c 100644
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx6/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 86acd347a8..470f46f37b 100644
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic harddisk
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 9ac2a13b3e..714c1a00ae 100644
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs
SUBTARGETS=xway xrx200 ase falcon
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
CPU_TYPE:=mips32r2
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index 853013a41e..362069bbc2 100644
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
DEVICE_TYPE:=developerboard
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index bbb9c01a6a..c6d971d2d3 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic p1020
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 611cafbb51..6794f5c807 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
index a861ca23b4..2b03cd36cc 100644
--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=octeon
CPU_CFLAGS_octeon:=-march=octeon
MAINTAINER:=John Crispin <blogic@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index cac70d8959..560e7123c3 100644
--- a/target/linux/ppc40x/Makefile
+++ b/target/linux/ppc40x/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs
CPU_TYPE:=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 78e840e765..fef3408c29 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs broken
CPU_TYPE:=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index fec7ddbc93..a1d209f90a 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx
SUBTARGETS:=rt305x rt3883 mt7620a rt288x
FEATURES:=squashfs gpio
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index c37123ad47..24b3d4c791 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -11,7 +11,7 @@ BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=pci targz broken
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile
index ee5dfc51b8..a7ca205ee4 100644
--- a/target/linux/realview/Makefile
+++ b/target/linux/realview/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=mpcore
CPU_SUBTYPE:=vfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
DEVICE_TYPE:=developerboard
diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile
index 0de518b45b..ea655142cd 100644
--- a/target/linux/xburst/Makefile
+++ b/target/linux/xburst/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
FEATURES:=targz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526 id800wt
-LINUX_VERSION:=3.10.13
+LINUX_VERSION:=3.10.15
DEVICE_TYPE=other
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:10:09 +0000