diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 11:57:51 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 11:57:51 +0000 |
| commit | e5839cb1022761ce449329e64e66fe70067f6962 (patch) | |
| tree | 70b669be9e632590ab374a1a224e5461ec94e69b /target/linux/ar71xx/base-files | |
| parent | ea7f49d5131d1f89161706bbdaf643d439fa6e0a (diff) | |
ar71xx: merge WZR-HP-G301NH support into WZR-HP-G300NH
Now that we can use a generic name for the switch there is no need for a
separate image for the WZR-HP-G301NH.
Update the default network config and remove the extra image.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27814 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/base-files')
6 files changed, 6 insertions, 35 deletions
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network index 79f4799f94..20dd9444de 100644 --- a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network +++ b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network @@ -16,11 +16,11 @@ config interface wan option proto dhcp config switch - option name rtl8366s + option name switch0 option reset 1 option enable_vlan 1 config switch_vlan - option device rtl8366s + option device switch0 option vlan 1 option ports "0 1 2 3 5t" diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g301nh/network b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g301nh/network deleted file mode 100644 index 72a4c881d7..0000000000 --- a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g301nh/network +++ /dev/null @@ -1,26 +0,0 @@ -config interface loopback - option ifname lo - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - -config interface lan - option ifname eth0.1 - option type bridge - option proto static - option ipaddr 192.168.1.1 - option netmask 255.255.255.0 - -config interface wan - option ifname eth1 - option proto dhcp - -config switch - option name rtl8366rb - option reset 1 - option enable_vlan 1 - -config switch_vlan - option device rtl8366rb - option vlan 1 - option ports "0 1 2 3 5t" diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 6cd6043f8f..d61a78d83e 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -123,7 +123,7 @@ get_status_led() { wrt160nl) status_led="wrt160nl:blue:wps" ;; - wzr-hp-g300nh | wzr-hp-g301nh) + wzr-hp-g300nh) status_led="wzr-hp-g300nh:green:router" ;; zcn-1523h-2 | zcn-1523h-5) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh b/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh index db8d9f489f..1308a7bb04 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh @@ -32,6 +32,6 @@ commit system EOF } -if [ "${board}" == "wzr-hp-g300nh" -o "${board}" == "wzr-hp-g301nh" ]; then +if [ "${board}" == "wzr-hp-g300nh" ]; then wzrhpg300nh_set_leds -fi
\ No newline at end of file +fi diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index e23ac28de1..92b0e66c6f 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -160,9 +160,6 @@ ar71xx_board_name() { *WZR-HP-G300NH) name="wzr-hp-g300nh" ;; - *WZR-HP-G301NH) - name="wzr-hp-g301nh" - ;; *ZCN-1523H-2) name="zcn-1523h-2" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 3de0c863b7..ab0adb2e8b 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -76,7 +76,7 @@ platform_check_image() { } return 0 ;; - ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-g301nh | wzr-hp-ag300h | nbg460n_550n_550nh | unifi ) + ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-ag300h | nbg460n_550n_550nh | unifi ) [ "$magic" != "2705" ] && { echo "Invalid image type." return 1 |