diff --git a/modules b/modules index 427f6739..42c02ef6 100644 --- a/modules +++ b/modules @@ -1,7 +1,7 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git -OPENWRT_COMMIT=4cbedb56aea22c7bb5e185076304d4bf00e96442 +OPENWRT_COMMIT=d12dc6e49189eda3a118cffb7188619f695696cd PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=a4ed43152165d368ad471d30281fd5c61e5c5e5e diff --git a/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch index e6371420..0201dcf9 100644 --- a/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch +++ b/patches/openwrt/0003-ar71xx-correctly-detect-hardware-revision-on-TP-Link-Archer-C5-and-C7.patch @@ -3,7 +3,7 @@ Date: Sat, 16 Aug 2014 17:52:34 +0200 Subject: ar71xx: correctly detect hardware revision on TP-Link Archer C5 and C7 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 1e96b6d..5aceaee 100755 +index df35775..6694839 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -214,6 +214,13 @@ tplink_board_detect() { @@ -20,7 +20,7 @@ index 1e96b6d..5aceaee 100755 *) hwver="" ;; -@@ -745,7 +752,7 @@ ar71xx_board_detect() { +@@ -748,7 +755,7 @@ ar71xx_board_detect() { esac case "$machine" in diff --git a/patches/openwrt/0006-ar71xx-add-support-for-TP-LINK-CPE210-220-510-520.patch b/patches/openwrt/0006-ar71xx-add-support-for-TP-LINK-CPE210-220-510-520.patch index 1673562f..529593e9 100644 --- a/patches/openwrt/0006-ar71xx-add-support-for-TP-LINK-CPE210-220-510-520.patch +++ b/patches/openwrt/0006-ar71xx-add-support-for-TP-LINK-CPE210-220-510-520.patch @@ -9,7 +9,7 @@ faster CPU, more RAM, 2x2 MIMO. Signed-off-by: Matthias Schiffer diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 1864b11..4b510dd 100755 +index eb96338..d9c7328 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -43,6 +43,9 @@ get_status_led() { @@ -23,7 +23,7 @@ index 1864b11..4b510dd 100755 status_led="db120:green:status" ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -index d3b766d..fb8df40 100755 +index 0d085be..a6e6721 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -61,6 +61,16 @@ carambola2) @@ -44,7 +44,7 @@ index d3b766d..fb8df40 100755 ucidef_set_led_usbdev "usb" "USB" "db120:green:usb" "1-1" ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -index c5cfd67..a9f00fa 100755 +index 4be30b8..78f4992 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -62,6 +62,13 @@ tl-wdr4900-v2) @@ -62,7 +62,7 @@ index c5cfd67..a9f00fa 100755 rb-2011l | \ rb-2011uas |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 5aceaee..0b0a8d6 100755 +index 6694839..c13a8eb 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -229,6 +229,39 @@ tplink_board_detect() { @@ -116,7 +116,7 @@ index 5aceaee..0b0a8d6 100755 *"DB120 reference board") name="db120" ;; -@@ -751,11 +788,8 @@ ar71xx_board_detect() { +@@ -754,11 +791,8 @@ ar71xx_board_detect() { ;; esac @@ -130,7 +130,7 @@ index 5aceaee..0b0a8d6 100755 [ -z "$name" ] && name="unknown" diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 846954c..15e998c 100755 +index eeaac6a..c583215 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -70,6 +70,33 @@ tplink_get_image_boot_size() { @@ -180,7 +180,7 @@ index 846954c..15e998c 100755 tew-673gru) dir825b_check_image "$1" && return 0 diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10 -index 9a8378a..2f05ec6 100644 +index 482914a..14b59f7 100644 --- a/target/linux/ar71xx/config-3.10 +++ b/target/linux/ar71xx/config-3.10 @@ -39,6 +39,7 @@ CONFIG_ATH79_MACH_AW_NR580=y @@ -327,7 +327,7 @@ index 78333be..a9d170c 100644 NAME:=TP-LINK TL-MR10U PACKAGES:=kmod-usb-core kmod-usb2 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 683c238..5ff7f35 100644 +index 425fcc5..55f11dc 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -261,6 +261,7 @@ cameo_ap121_mtdlayout_8M=mtdparts=spi0.0:64k(u-boot)ro,64k(art)ro,64k(mac)ro,64k @@ -371,7 +371,7 @@ index 683c238..5ff7f35 100644 define Image/Build/CyberTAN echo -n '' > $(KDIR_TMP)/empty.bin $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp \ -@@ -1226,6 +1253,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWDR4310V1,tl-wdr4310-v1,TL-WDR4 +@@ -1227,6 +1254,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWDR4310V1,tl-wdr4310-v1,TL-WDR4 $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWDR4900V2,tl-wdr4900-v2,TL-WDR4900-v2,ttyS0,115200,0x49000002,1,8Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,MW4530RV1,mw4530r-v1,TL-WDR4300,ttyS0,115200,0x45300001,1,8Mlzma)) diff --git a/patches/openwrt/0008-ar71xx-add-board-support-for-ubnt-loco-m-xw.patch b/patches/openwrt/0008-ar71xx-add-board-support-for-ubnt-loco-m-xw.patch index f154fa6c..137bf991 100644 --- a/patches/openwrt/0008-ar71xx-add-board-support-for-ubnt-loco-m-xw.patch +++ b/patches/openwrt/0008-ar71xx-add-board-support-for-ubnt-loco-m-xw.patch @@ -5,7 +5,7 @@ Subject: ar71xx: add board support for ubnt loco m xw Signed-off-by: Alexander Couzens diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 4b510dd..6e63343 100755 +index d9c7328..924766d 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -34,7 +34,7 @@ get_status_led() { @@ -18,7 +18,7 @@ index 4b510dd..6e63343 100755 ;; bxu2000n-2-a1) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds -index fb8df40..8f845a0 100755 +index a6e6721..2676b48 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -38,7 +38,8 @@ ap113) @@ -32,7 +32,7 @@ index fb8df40..8f845a0 100755 ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:orange:link2" "wlan0" "26" "100" "-25" "13" ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link3" "wlan0" "51" "100" "-50" "13" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network -index a9f00fa..5641a86 100755 +index 78f4992..c494310 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -293,6 +293,7 @@ bullet-m |\ @@ -44,7 +44,7 @@ index a9f00fa..5641a86 100755 mr600v2 |\ rb-411 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 0b0a8d6..4e58efe 100755 +index c13a8eb..19cd1a7 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -396,6 +396,9 @@ ar71xx_board_detect() { @@ -58,7 +58,7 @@ index 0b0a8d6..4e58efe 100755 name="nanostation-m" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 15e998c..7f02089 100755 +index c583215..a566b62 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -217,6 +217,7 @@ platform_check_image() { @@ -70,10 +70,10 @@ index 15e998c..7f02089 100755 rocket-m | \ nanostation-m-xw | \ diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 5ff7f35..0d88ea5 100644 +index 55f11dc..3fdaf47 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile -@@ -1275,6 +1275,7 @@ $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTNANOM,ubnt-nano-m,UBNT-NM,ttyS0,11 +@@ -1276,6 +1276,7 @@ $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTNANOM,ubnt-nano-m,UBNT-NM,ttyS0,11 $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTUNIFI,ubnt-unifi,UBNT-UF,ttyS0,115200,XM,BZ,ar7240)) $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,BZ,ar7240)) $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTNANOMXW,ubnt-nano-m-xw,UBNT-NM-XW,ttyS0,115200,XM,XW,ar934x)) @@ -81,7 +81,7 @@ index 5ff7f35..0d88ea5 100644 $(eval $(call SingleProfile,UBNTXM,64kraw,UBNTAIRGW,ubnt-air-gateway,UBNT-AGW,ttyATH0,115200,XM,AirGW,ar933x)) $(eval $(call SingleProfile,WHRHPG300N,64kraw,WHRG301N,whr-g301n,WHR-G301N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-G301N)) -@@ -1320,7 +1321,7 @@ $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4 TLWR941NV6)) +@@ -1322,7 +1323,7 @@ $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4 TLWR941NV6)) $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2)) $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4300V1IL TLWDR4310V1 MW4530RV1)) $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M)) diff --git a/patches/openwrt/0010-ar71xx-add-flush-reset-register-writes-should-fix-restart-issues-17839.patch b/patches/openwrt/0010-ar71xx-add-flush-reset-register-writes-should-fix-restart-issues-17839.patch deleted file mode 100644 index 20c99432..00000000 --- a/patches/openwrt/0010-ar71xx-add-flush-reset-register-writes-should-fix-restart-issues-17839.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Matthias Schiffer -Date: Fri, 9 Jan 2015 09:27:39 +0100 -Subject: ar71xx: add flush reset register writes, should fix restart issues (#17839) - -Backport of r43777 - -diff --git a/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch b/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch -index 0027c59..612078c 100644 ---- a/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch -+++ b/target/linux/ar71xx/patches-3.10/728-MIPS-ath79-fix-restart.patch -@@ -8,3 +8,13 @@ - ath79_device_reset_set(AR71XX_RESET_FULL_CHIP); - for (;;) - if (cpu_wait) -+--- a/arch/mips/include/asm/mach-ath79/ath79.h -++++ b/arch/mips/include/asm/mach-ath79/ath79.h -+@@ -144,6 +144,7 @@ static inline u32 ath79_pll_rr(unsigned -+ static inline void ath79_reset_wr(unsigned reg, u32 val) -+ { -+ __raw_writel(val, ath79_reset_base + reg); -++ (void) __raw_readl(ath79_reset_base + reg); /* flush */ -+ } -+ -+ static inline u32 ath79_reset_rr(unsigned reg) diff --git a/patches/openwrt/0011-firmware-utils-remove-dependency-on-error.h-in-tplink-safeloader.patch b/patches/openwrt/0010-firmware-utils-remove-dependency-on-error.h-in-tplink-safeloader.patch similarity index 100% rename from patches/openwrt/0011-firmware-utils-remove-dependency-on-error.h-in-tplink-safeloader.patch rename to patches/openwrt/0010-firmware-utils-remove-dependency-on-error.h-in-tplink-safeloader.patch diff --git a/patches/openwrt/0012-build-explicitly-unexport-CONFIG_SITE.patch b/patches/openwrt/0011-build-explicitly-unexport-CONFIG_SITE.patch similarity index 100% rename from patches/openwrt/0012-build-explicitly-unexport-CONFIG_SITE.patch rename to patches/openwrt/0011-build-explicitly-unexport-CONFIG_SITE.patch diff --git a/patches/openwrt/0013-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch b/patches/openwrt/0012-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch similarity index 88% rename from patches/openwrt/0013-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch rename to patches/openwrt/0012-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch index 4b3285f5..8065eace 100644 --- a/patches/openwrt/0013-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch +++ b/patches/openwrt/0012-ar71xx-fix-board-detection-for-TP-LINK-TL-WA860RE.patch @@ -5,10 +5,10 @@ Subject: ar71xx: fix board detection for TP-LINK TL-WA860RE Signed-off-by: Matthias Schiffer diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 4e58efe..f93a6df 100755 +index 19cd1a7..b0a0bd6 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -627,6 +627,9 @@ ar71xx_board_detect() { +@@ -630,6 +630,9 @@ ar71xx_board_detect() { *TL-WA850RE) name="tl-wa850re" ;;