Author: blogic Date: 2014-07-20 19:31:11 +0200 (Sun, 20 Jul 2014) New Revision: 41776
Removed: trunk/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch Modified: trunk/include/kernel-version.mk trunk/target/linux/ar7/Makefile trunk/target/linux/ar71xx/Makefile trunk/target/linux/at91/Makefile trunk/target/linux/atheros/Makefile trunk/target/linux/au1000/Makefile trunk/target/linux/avr32/Makefile trunk/target/linux/bcm53xx/Makefile trunk/target/linux/brcm2708/Makefile trunk/target/linux/brcm47xx/Makefile trunk/target/linux/brcm63xx/Makefile trunk/target/linux/cns21xx/Makefile trunk/target/linux/imx6/Makefile trunk/target/linux/ixp4xx/Makefile trunk/target/linux/kirkwood/Makefile trunk/target/linux/lantiq/Makefile trunk/target/linux/malta/Makefile trunk/target/linux/mpc85xx/Makefile trunk/target/linux/octeon/Makefile trunk/target/linux/ppc40x/Makefile trunk/target/linux/ppc44x/Makefile trunk/target/linux/ramips/Makefile trunk/target/linux/rb532/Makefile trunk/target/linux/realview/Makefile trunk/target/linux/sparc/Makefile trunk/target/linux/uml/Makefile trunk/target/linux/x86/Makefile trunk/target/linux/xburst/Makefile Log: kernel: update to 3.10.49 Signed-off-by: John Crispin <[email protected]> Modified: trunk/include/kernel-version.mk =================================================================== --- trunk/include/kernel-version.mk 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/include/kernel-version.mk 2014-07-20 17:31:11 UTC (rev 41776) @@ -14,8 +14,8 @@ ifeq ($(LINUX_VERSION),3.9.11) LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 endif -ifeq ($(LINUX_VERSION),3.10.44) - LINUX_KERNEL_MD5SUM:=8a4006eff3bbd8aff58fe4b443223e7a +ifeq ($(LINUX_VERSION),3.10.49) + LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb endif ifeq ($(LINUX_VERSION),3.13.7) LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f Modified: trunk/target/linux/ar7/Makefile =================================================================== --- trunk/target/linux/ar7/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ar7/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ MAINTAINER:=Florian Fainelli <[email protected]> SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/ar71xx/Makefile =================================================================== --- trunk/target/linux/ar71xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ar71xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ CPU_TYPE=34kc SUBTARGETS:=generic nand mikrotik -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Deleted: trunk/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch =================================================================== --- trunk/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ar71xx/patches-3.10/104-watchdog-ath79-wdt-avoid-spurious-restarts-on-AR934x.patch 2014-07-20 17:31:11 UTC (rev 41776) @@ -1,48 +0,0 @@ -From 2ff030d44672d745c5327b72463af43f5103e99b Mon Sep 17 00:00:00 2001 -From: Gabor Juhos <[email protected]> -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 <[email protected]> -Cc: <[email protected]> ---- - 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); Modified: trunk/target/linux/at91/Makefile =================================================================== --- trunk/target/linux/at91/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/at91/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ FEATURES:=squashfs targz ext2 usb CPU_TYPE:=arm926ej-s -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/atheros/Makefile =================================================================== --- trunk/target/linux/atheros/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/atheros/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -11,7 +11,7 @@ BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/au1000/Makefile =================================================================== --- trunk/target/linux/au1000/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/au1000/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ SUBTARGETS=au1500 au1550 MAINTAINER:=Florian Fainelli <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv Modified: trunk/target/linux/avr32/Makefile =================================================================== --- trunk/target/linux/avr32/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/avr32/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -12,7 +12,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/bcm53xx/Makefile =================================================================== --- trunk/target/linux/bcm53xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/bcm53xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ MAINTAINER:=Hauke Mehrtens <[email protected]> CPU_TYPE:=cortex-a9 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/brcm2708/Makefile =================================================================== --- trunk/target/linux/brcm2708/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/brcm2708/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -15,7 +15,7 @@ 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 Modified: trunk/target/linux/brcm47xx/Makefile =================================================================== --- trunk/target/linux/brcm47xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/brcm47xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ SUBTARGETS:=generic mips74k legacy MAINTAINER:=Hauke Mehrtens <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/brcm63xx/Makefile =================================================================== --- trunk/target/linux/brcm63xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/brcm63xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -11,7 +11,7 @@ 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 <[email protected]> include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/cns21xx/Makefile =================================================================== --- trunk/target/linux/cns21xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/cns21xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -12,7 +12,7 @@ FEATURES:=squashfs CPU_TYPE:=fa526 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/imx6/Makefile =================================================================== --- trunk/target/linux/imx6/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/imx6/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -14,7 +14,7 @@ CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/ixp4xx/Makefile =================================================================== --- trunk/target/linux/ixp4xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ixp4xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ MAINTAINER:=Imre Kaloz <[email protected]> SUBTARGETS=generic harddisk -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/kirkwood/Makefile =================================================================== --- trunk/target/linux/kirkwood/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/kirkwood/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/lantiq/Makefile =================================================================== --- trunk/target/linux/lantiq/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/lantiq/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -11,7 +11,7 @@ FEATURES:=squashfs SUBTARGETS=xway xrx200 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 CPU_TYPE:=mips32r2 Modified: trunk/target/linux/malta/Makefile =================================================================== --- trunk/target/linux/malta/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/malta/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -12,7 +12,7 @@ INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE:=developerboard Modified: trunk/target/linux/mpc85xx/Makefile =================================================================== --- trunk/target/linux/mpc85xx/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/mpc85xx/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -14,7 +14,7 @@ MAINTAINER:=Imre Kaloz <[email protected]> SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/octeon/Makefile =================================================================== --- trunk/target/linux/octeon/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/octeon/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -14,7 +14,7 @@ CPU_CFLAGS_octeon:=-march=octeon -mabi=64 MAINTAINER:=John Crispin <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/ppc40x/Makefile =================================================================== --- trunk/target/linux/ppc40x/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ppc40x/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ CPU_TYPE:=405 MAINTAINER:=Imre Kaloz <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/ppc44x/Makefile =================================================================== --- trunk/target/linux/ppc44x/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ppc44x/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ CPU_TYPE:=440 MAINTAINER:=Imre Kaloz <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/ramips/Makefile =================================================================== --- trunk/target/linux/ramips/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/ramips/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -12,7 +12,7 @@ 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 += \ Modified: trunk/target/linux/rb532/Makefile =================================================================== --- trunk/target/linux/rb532/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/rb532/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -11,7 +11,7 @@ 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 Modified: trunk/target/linux/realview/Makefile =================================================================== --- trunk/target/linux/realview/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/realview/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -14,7 +14,7 @@ CPU_SUBTYPE:=vfp MAINTAINER:=Florian Fainelli <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE:=developerboard Modified: trunk/target/linux/sparc/Makefile =================================================================== --- trunk/target/linux/sparc/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/sparc/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -11,7 +11,7 @@ BOARDNAME:=Sun UltraSPARC FEATURES+=fpu tgz ext4 squashfs broken -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 MAINTAINER:=Imre Kaloz <[email protected]> include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/uml/Makefile =================================================================== --- trunk/target/linux/uml/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/uml/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -23,7 +23,7 @@ FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <[email protected]> -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 include $(INCLUDE_DIR)/target.mk Modified: trunk/target/linux/x86/Makefile =================================================================== --- trunk/target/linux/x86/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/x86/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -13,7 +13,7 @@ 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 Modified: trunk/target/linux/xburst/Makefile =================================================================== --- trunk/target/linux/xburst/Makefile 2014-07-20 17:31:05 UTC (rev 41775) +++ trunk/target/linux/xburst/Makefile 2014-07-20 17:31:11 UTC (rev 41776) @@ -12,7 +12,7 @@ FEATURES:=targz nand ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=3.10.44 +LINUX_VERSION:=3.10.49 DEVICE_TYPE=other _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
