From 1be49d1326eeb0f36d4ba7dd51b47161bdb20de0 Mon Sep 17 00:00:00 2001 From: Christoph Krapp Date: Fri, 18 May 2018 23:08:08 +0200 Subject: [PATCH] Update LEDE patches (#1399) --- ...-add-support-for-TP-Link-TL-WR940N-v6.patch | 18 +++++++++--------- ...71xx-set-status-led-for-the-gl-boards.patch | 4 ++-- ...71xx-add-support-for-GL.iNet-GL-AR750.patch | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch b/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch index 3b5e101f..4cbe2d82 100644 --- a/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch +++ b/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch @@ -10,10 +10,10 @@ Installation: flash factory image through WEB UI or use TFTP. Signed-off-by: Robert Marko diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds -index f9483e9a706fbd98ce6a42e968bc0d31e9da5c84..5ac817cb5dd9f18c3ed24bae4e7de92db23b5fb9 100755 +index e8b13af7c24dea86519c962fa6381fd75971e8b9..62d7f014be28782b9961551f2377a66ccadfb329 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds -@@ -670,6 +670,9 @@ tl-wr941nd-v6) +@@ -676,6 +676,9 @@ tl-wr941nd-v6) ucidef_set_led_switch "lan4" "LAN4" "tp-link:blue:lan4" "switch0" "0x02" ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt" ;; @@ -24,10 +24,10 @@ index f9483e9a706fbd98ce6a42e968bc0d31e9da5c84..5ac817cb5dd9f18c3ed24bae4e7de92d tl-wr841n-v11|\ tl-wr842n-v3) diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network -index 1690172b5dfac1e1aa278c38c27ba64cfd61ade0..f6d21204ccf48456124e2c9705911c3a5841ad52 100755 +index 1018ab4449f896d565b57ecbdc73b7e3d7fbe486..ae82cfe008169a8282ac51746cf2299eec8c81d8 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network -@@ -297,6 +297,7 @@ ar71xx_setup_interfaces() +@@ -298,6 +298,7 @@ ar71xx_setup_interfaces() tl-wdr6500-v2|\ tl-wr841n-v8|\ tl-wr940n-v4|\ @@ -50,10 +50,10 @@ index 382500b75ee6dc1fe1126fb3121f4ae205c901d4..4d792e773c8efe0cb2e5e328d777db85 status_led="tp-link:green:qss" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 59ede17653bbb1994ce9fa734c86c877aedf67e4..99eafe88da8213f5475dedf71054083b73db33d7 100755 +index a815ffe07322c20cddaa3c4f97e3bf62a3cf15ec..21b1c44404d383ef99860caf95a8e19b9cbf5087 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -1079,6 +1079,9 @@ ar71xx_board_detect() { +@@ -1082,6 +1082,9 @@ ar71xx_board_detect() { *TL-WR941ND) name="tl-wr941nd" ;; @@ -64,7 +64,7 @@ index 59ede17653bbb1994ce9fa734c86c877aedf67e4..99eafe88da8213f5475dedf71054083b name="tl-wr941nd-v5" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 5e8a06a7ae70ec349693c09deedbfce41a52cfc2..b3f558131811bcb37632b8847686de68c44319d8 100755 +index 491b5d5a98b44844f14441d4024f2ad9667186e0..03677ad1240c9a5af341354b95561f9d493a9cd8 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -443,6 +443,7 @@ platform_check_image() { @@ -201,10 +201,10 @@ index d693b947c843d2a74cd252503fa8bf68b20da4ab..b530622d9f00b8ce3b906ad5fe62de01 +MIPS_MACHINE(ATH79_MACH_TL_WR940N_V6, "TL-WR940N-v6", "TP-LINK TL-WR940N v6", + tl_wr940n_v6_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -index 72c1e38c74707aba8fbd3aebc36f35becabd4987..24ff1dc7330264a91d01502715d0de676f789179 100644 +index 07f1877180e27ff189387c5f34a61702d0fa9bd2..89ddbbc976c9393608a80b9ce56e02a4d403ea2a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -@@ -241,6 +241,7 @@ enum ath79_mach_type { +@@ -242,6 +242,7 @@ enum ath79_mach_type { ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */ ATH79_MACH_TL_WR941ND_V6, /* TP-LINK TL-WR941ND v6 */ ATH79_MACH_TL_WR940N_V4, /* TP-LINK TL-WR940N v4 */ diff --git a/patches/lede/0086-ar71xx-set-status-led-for-the-gl-boards.patch b/patches/lede/0086-ar71xx-set-status-led-for-the-gl-boards.patch index ec041872..3dd8739b 100644 --- a/patches/lede/0086-ar71xx-set-status-led-for-the-gl-boards.patch +++ b/patches/lede/0086-ar71xx-set-status-led-for-the-gl-boards.patch @@ -5,7 +5,7 @@ Subject: ar71xx: set status led for the gl-* boards Signed-off-by: Wojciech Jowsa diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds -index e8b13af7c24dea86519c962fa6381fd75971e8b9..5ab407ab0f46d4927dd5c2af545814bf265b84ba 100755 +index 62d7f014be28782b9961551f2377a66ccadfb329..f4d83cee519406a188cc9dde355f509dd644625a 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -311,19 +311,18 @@ fritz4020) @@ -39,7 +39,7 @@ index e8b13af7c24dea86519c962fa6381fd75971e8b9..5ab407ab0f46d4927dd5c2af545814bf gl-domino|\ wrt160nl) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index 382500b75ee6dc1fe1126fb3121f4ae205c901d4..a5ad6ea24cf51e7fb5e49e82856851851c7fdcdb 100644 +index 4d792e773c8efe0cb2e5e328d777db853cdd846b..336d078f72a06073e3465c36ca98035c7d70282f 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -64,7 +64,9 @@ get_status_led() { diff --git a/patches/lede/0087-ar71xx-add-support-for-GL.iNet-GL-AR750.patch b/patches/lede/0087-ar71xx-add-support-for-GL.iNet-GL-AR750.patch index fbddd2ea..01830ca1 100644 --- a/patches/lede/0087-ar71xx-add-support-for-GL.iNet-GL-AR750.patch +++ b/patches/lede/0087-ar71xx-add-support-for-GL.iNet-GL-AR750.patch @@ -30,7 +30,7 @@ to flash OpenWrt/LEDE firmware. Signed-off-by: Piotr Dymacz diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds -index 5ab407ab0f46d4927dd5c2af545814bf265b84ba..fae773b65c2a5e604a61b845406340f88ec59637 100755 +index f4d83cee519406a188cc9dde355f509dd644625a..f94cc3c85b798458cc97c06bb0d44bdc426d057d 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -314,6 +314,10 @@ fritz4020) @@ -45,10 +45,10 @@ index 5ab407ab0f46d4927dd5c2af545814bf265b84ba..fae773b65c2a5e604a61b845406340f8 ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt" ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0" diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network -index 1018ab4449f896d565b57ecbdc73b7e3d7fbe486..2f42862b8607fab814ed550b5d1841a572492923 100755 +index ae82cfe008169a8282ac51746cf2299eec8c81d8..c8990c60f504286d0fd28c7b17f54c9c3b5a891e 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network -@@ -368,6 +368,7 @@ ar71xx_setup_interfaces() +@@ -369,6 +369,7 @@ ar71xx_setup_interfaces() onion-omega) ucidef_set_interface_lan "wlan0" ;; @@ -57,7 +57,7 @@ index 1018ab4449f896d565b57ecbdc73b7e3d7fbe486..2f42862b8607fab814ed550b5d1841a5 ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_add_switch "switch0" \ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh -index a5ad6ea24cf51e7fb5e49e82856851851c7fdcdb..bfb11c105b1c6be16729145fce5f93e834c6ea8d 100644 +index 336d078f72a06073e3465c36ca98035c7d70282f..01d3b787bedcab82a5797c9a4801e8139887cc2c 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -249,6 +249,7 @@ get_status_led() { @@ -68,7 +68,7 @@ index a5ad6ea24cf51e7fb5e49e82856851851c7fdcdb..bfb11c105b1c6be16729145fce5f93e8 nbg6716) status_led="$board:white:power" ;; -@@ -486,7 +487,8 @@ set_state() { +@@ -489,7 +490,8 @@ set_state() { done) status_led_on case $(ar71xx_board_name) in @@ -91,7 +91,7 @@ index 91bdf0d3c591516f58030b165052b3dd2751314f..1626622a8e46484bbf2719f19843e61d ath10kcal_extract "art" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index a815ffe07322c20cddaa3c4f97e3bf62a3cf15ec..6071f95fa7a9d74270cc1f07c0729884defced81 100755 +index 21b1c44404d383ef99860caf95a8e19b9cbf5087..35b742a5f1fee0bc24ab2d88e32f118c1df4e2b3 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -650,6 +650,9 @@ ar71xx_board_detect() { @@ -117,7 +117,7 @@ index d677599d8c6380d9920e95abc9fb4b92cc0cec29..ba6e08b00d979bc73f7199756e22ca39 jwap003 |\ pb42 |\ diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 491b5d5a98b44844f14441d4024f2ad9667186e0..113af2f1f87e9e8b7cb10ef3c8aa3513d06a7e89 100755 +index 03677ad1240c9a5af341354b95561f9d493a9cd8..236520b27c4d6d0b1b7e483d1100fb5ab156d475 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -253,6 +253,7 @@ platform_check_image() { @@ -327,7 +327,7 @@ index 0000000000000000000000000000000000000000..9ee6e29c02139b972a83a555fcd69376 +MIPS_MACHINE(ATH79_MACH_GL_AR750, "GL-AR750", "GL.iNet GL-AR750", + gl_ar750_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -index 07f1877180e27ff189387c5f34a61702d0fa9bd2..a8a8df5e54473ecb827dda2f2c2154b1c056c426 100644 +index 89ddbbc976c9393608a80b9ce56e02a4d403ea2a..11ccdbb5083807ef137b8cd2d110de7a97a34e38 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -106,6 +106,7 @@ enum ath79_mach_type {