aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/base-files
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-03-03 21:59:34 +0000
committerLuka Perkov <luka@openwrt.org>2013-03-03 21:59:34 +0000
commita5ebfc79ba93446ea576153c77f74d41c53c4d56 (patch)
treeb864216a97218c97a34d0246536ae1d93f798c13 /target/linux/ar71xx/base-files
parent7f0cc47d8575d68bab55ad3d192f0815dced6a4a (diff)
downloadupstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.tar.gz
upstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.tar.bz2
upstream-a5ebfc79ba93446ea576153c77f74d41c53c4d56.zip
ar71xx: rework changes from r35840
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35865
Diffstat (limited to 'target/linux/ar71xx/base-files')
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/diag.sh3
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix3
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/01_leds3
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/02_network3
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration1
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh5
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/upgrade/platform.sh1
7 files changed, 5 insertions, 14 deletions
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index c863b21a81..adf32f12fb 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -152,8 +152,7 @@ get_status_led() {
status_led="buffalo:green:status"
;;
wzr-hp-ag300h | \
- wzr-hp-g300nh2 | \
- wzr-600dhp)
+ wzr-hp-g300nh2)
status_led="buffalo:red:diag"
;;
wndr3700)
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
index 6a7f521afa..102415009b 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
@@ -42,8 +42,7 @@ if [ $phyname -a $ACTION = "add" ]; then
. /lib/ar71xx.sh
case $(ar71xx_board_name) in
- wzr-hp-ag300h|\
- wzr-600dhp)
+ wzr-hp-ag300h)
ar922x_disable_gpio_jtag $phyname
;;
esac;
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 3e54d64d03..392439385b 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -212,8 +212,7 @@ wlae-ag300n)
ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0"
;;
-wzr-hp-ag300h | \
-wzr-600dhp)
+wzr-hp-ag300h)
ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0"
ucidef_set_led_netdev "router" "ROUTER" "buffalo:green:router" "eth1"
ucidef_set_led_usbdev "usb" "USB" "buffalo: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 15a1d39ac4..b1f84da605 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -233,8 +233,7 @@ tl-wr841n-v7 |\
whr-g301n |\
whr-hp-g300n |\
whr-hp-gn |\
-wzr-hp-ag300h |\
-wzr-600dhp)
+wzr-hp-ag300h)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" "1" "1"
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
index 8757b21a80..718a924f19 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@@ -75,7 +75,6 @@ whr-hp-g300n|\
whr-hp-gn|\
wzr-hp-ag300h|\
wzr-hp-g450h|\
-wzr-600dhp|\
ew-dorin|\
ew-dorin-router)
migrate_switch_name "eth0" "switch0"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 84751e8b19..4fd48d5cc0 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -456,7 +456,7 @@ ar71xx_board_detect() {
*WRT400N)
name="wrt400n"
;;
- *WZR-HP-AG300H)
+ *"WZR-HP-AG300H/WZR-600DHP")
name="wzr-hp-ag300h"
;;
*WZR-HP-G300NH)
@@ -468,9 +468,6 @@ ar71xx_board_detect() {
*WZR-HP-G300NH2)
name="wzr-hp-g300nh2"
;;
- *WZR-600DHP)
- name="wzr-600dhp"
- ;;
*WHR-HP-G300N)
name="whr-hp-g300n"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index d3e14d16ad..c16d184e73 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -125,7 +125,6 @@ platform_check_image() {
wzr-hp-g300nh | \
wzr-hp-g450h | \
wzr-hp-ag300h | \
- wzr-600dhp | \
whr-g301n | \
whr-hp-g300n | \
whr-hp-gn | \