diff options
| author | John Crispin <blogic@openwrt.org> | 2014-07-20 17:31:11 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-07-20 17:31:11 +0000 |
| commit | a7911af6eff273183bb185db935b01030fd04882 (patch) | |
| tree | 0a0f727d8e2b8cea1ea4283808d0d8c5dd5c66fb /target/linux | |
| parent | fefd51407f9623fc7b235abe6a7856a9ddcda358 (diff) | |
| download | master-187ad058-a7911af6eff273183bb185db935b01030fd04882.tar.gz master-187ad058-a7911af6eff273183bb185db935b01030fd04882.tar.bz2 master-187ad058-a7911af6eff273183bb185db935b01030fd04882.zip | |
kernel: update to 3.10.49
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41776 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
28 files changed, 27 insertions, 75 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 0d92295896..3f40e57837 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm low_mem MAINTAINER:=Florian Fainelli <florian@openwrt.org> SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index b2a16f9125..1b400745d1 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch b/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch deleted file mode 100644 index c7bf06656e..0000000000 --- a/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2ff030d44672d745c5327b72463af43f5103e99b Mon Sep 17 00:00:00 2001 -From: Gabor Juhos <juhosg@openwrt.org> -Date: Tue, 25 Mar 2014 17:07:46 +0100 -Subject: [PATCH] watchdog: ath79-wdt: avoid spurious restarts on AR934x - -On some AR934x based systems, where the frequency of -the AHB bus is relatively high, the built-in watchdog -causes a spurious restart when it gets enabled. - -The possible cause of these restarts is that the timeout -value written into the TIMER register does not reaches -the hardware in time. - -Add an explicit delay into the ath79_wdt_enable function -to avoid the spurious restarts. - -Signed-off-by: Gabor Juhos <juhosg@openwrt.org> -Cc: <stable@vger.kernel.org> ---- - drivers/watchdog/ath79_wdt.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/watchdog/ath79_wdt.c -+++ b/drivers/watchdog/ath79_wdt.c -@@ -20,6 +20,7 @@ - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/bitops.h> -+#include <linux/delay.h> - #include <linux/errno.h> - #include <linux/fs.h> - #include <linux/init.h> -@@ -91,6 +92,15 @@ static inline void ath79_wdt_keepalive(v - static inline void ath79_wdt_enable(void) - { - ath79_wdt_keepalive(); -+ -+ /* -+ * Updating the TIMER register requires a few microseconds -+ * on the AR934x SoCs at least. Use a small delay to ensure -+ * that the TIMER register is updated within the hardware -+ * before enabling the watchdog. -+ */ -+ udelay(2); -+ - ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR); - /* flush write */ - ath79_wdt_rr(WDOG_REG_CTRL); diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index feb800dc0b..01fc4dd85f 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Atmel AT91 FEATURES:=squashfs targz ext2 usb CPU_TYPE:=arm926ej-s -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index eba9f77715..1b52909476 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 5fb4a436fb..9a2e4f5fae 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci SUBTARGETS=au1500 au1550 MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index da5d541d96..de5410309e 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index 1c6a916078..679997c0a7 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> CPU_TYPE:=cortex-a9 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index abeedb3b47..afb62016e1 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.44 +LINUX_VERSION:=3.10.49 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 4d96a1dd85..795b858404 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs usb SUBTARGETS:=generic mips74k legacy MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 02596a138f..4a74e96c03 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 usbgadget -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 2b0d7f2edf..4f320b2f29 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index 4e55a76bb5..544c757a56 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 36d3bf2cd2..b0665db051 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index d1573b06b5..65c6e5ee28 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand nand ubifs CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 32bec5e663..143c110664 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq FEATURES:=squashfs SUBTARGETS=xway xrx200 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 CPU_TYPE:=mips32r2 diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 92bd3e4b1a..e5b16b2bdc 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.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE:=developerboard diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index f829df5892..37669684db 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index 13cbe716e5..5138325de9 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=octeon CPU_CFLAGS_octeon:=-march=octeon -mabi=64 MAINTAINER:=John Crispin <blogic@openwrt.org> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 9e7e5d8cf0..817abc7f49 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index f84aa0435f..f6d932743a 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.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index c9551d8d81..d363743fc2 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x mt7620a mt7620n mt7621 rt3883 rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index a98404d737..3fda24b6f0 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=pci targz -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 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 fb5b9f264a..3d49605130 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.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE:=developerboard diff --git a/target/linux/sparc/Makefile b/target/linux/sparc/Makefile index 2e7083999c..0fee7c17eb 100644 --- a/target/linux/sparc/Makefile +++ b/target/linux/sparc/Makefile @@ -11,7 +11,7 @@ BOARD:=sparc BOARDNAME:=Sun UltraSPARC FEATURES+=fpu tgz ext4 squashfs broken -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 6c552e149e..5f4896c5d4 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index b889de87b0..32eafdfc0a 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ rdc -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 KERNELNAME:=bzImage diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 007e3edb2c..92897393d6 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=targz nand ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE=other |