ar71xx: create wndr3700 network config from uci-defaults

Since that was the last configuration in defconfig directory we can drop the
defconfig init script too.

Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39373

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
deleted file mode 100644 (file)
index ad05525..0000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
+++ /dev/null
@@ -1,77 +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
-       option ip6assign 60
-
-config interface wan
-       option ifname   eth1
-       option proto    dhcp
-
-config interface wan6
-       option ifname   @wan
-       option proto    dhcpv6
-
-config globals globals
-       option ula_prefix auto
-
-config switch
-       option name     rtl8366s
-       option reset    1
-       option enable_vlan 1
-       # Blinkrate: 0=43ms; 1=84ms; 2=120ms; 3=170ms; 4=340ms; 5=670ms
-       option blinkrate        2
-
-config switch_vlan
-       option device   rtl8366s
-       option vlan     1
-       option ports    "0 1 2 3 5t"
-
-config switch_port
-       # Port 1 controls the GREEN configuration of LEDs for
-       # the switch and the section does not correspond to a real
-       # switch port.
-       #
-       # 0=LED off; 1=Collision/FDX; 2=Link/activity; 3=1000 Mb/s;
-       # 4=100 Mb/s; 5=10 Mb/s; 6=1000 Mb/s+activity; 7=100 Mb/s+activity;
-       # 8=10 Mb/s+activity; 9=10/100 Mb/s+activity; 10: Fiber;
-       # 11: Fault; 12: Link/activity(tx); 13: Link/activity(rx);
-       # 14: Link (master); 15: separate register
-
-       option device           rtl8366s
-       option port             1
-       option led              6
-
-config switch_port
-       # Port 2 controls the ORANGE configuration of LEDs for
-       # the switch and the section does not correspond to a real
-       # switch port.
-       #
-       # See the key above for switch port 1 for the meaning of the
-       # 'led' setting below.
-       
-       option device           rtl8366s
-       option port             2
-       option led              9
-
-config switch_port
-       # Port 5 controls the configuration of the WAN LED and the
-       # section does not correspond to a real switch port.
-       #
-       # To toggle the use of green or orange LEDs for the WAN port,
-       # see the LED setting for wndr3700:green:wan in /etc/config/system.
-       #
-       # See the key above for switch port 1 for the meaning of the
-       # 'led' setting below.
-
-       option device           rtl8366s
-       option port             5
-       option led              2

diff --git a/target/linux/ar71xx/base-files/etc/init.d/defconfig b/target/linux/ar71xx/base-files/etc/init.d/defconfig
deleted file mode 100755 (executable)
index 364fa4a..0000000
--- a/target/linux/ar71xx/base-files/etc/init.d/defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-
-START=05
-
-start() {
-       . /lib/ar71xx.sh
-
-       local board=$(ar71xx_board_name)
-
-       [ ! -d /etc/defconfig/$board ] && return 0
-
-       for f in $( ls /etc/defconfig/$board ); do
-               if [ ! -e /etc/config/$f ]; then
-                       cp /etc/defconfig/$board/$f /etc/config/
-               fi
-       done
-}

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 a7eeab017c5cb7e772bab297ef2b0c761658bb25..dac75ae051afaf471c131c95d1ea686d8fe55a09 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -321,6 +321,46 @@ ew-dorin-router)
        ucidef_add_switch_vlan "switch0" "1" "0 2 3"
        ;;
 
+wndr3700)
+       ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+       ucidef_add_switch "switch0" "1" "1"
+       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+       # Blinkrate: 0=43ms; 1=84ms; 2=120ms; 3=170ms; 4=340ms; 5=670ms
+       uci set network.@switch[-1].blinkrate='2'
+
+       ucidef_add_switch_port "switch0" "1"
+       # Port 1 controls the GREEN configuration of LEDs for
+       # the switch and the section does not correspond to a real
+       # switch port.
+       #
+       # 0=LED off; 1=Collision/FDX; 2=Link/activity; 3=1000 Mb/s;
+       # 4=100 Mb/s; 5=10 Mb/s; 6=1000 Mb/s+activity; 7=100 Mb/s+activity;
+       # 8=10 Mb/s+activity; 9=10/100 Mb/s+activity; 10: Fiber;
+       # 11: Fault; 12: Link/activity(tx); 13: Link/activity(rx);
+       # 14: Link (master); 15: separate register
+       uci set network.@switch_port[-1].led='6'
+
+       ucidef_add_switch_port "switch0" "2"
+       # Port 2 controls the ORANGE configuration of LEDs for
+       # the switch and the section does not correspond to a real
+       # switch port.
+       #
+       # See the key above for switch port 1 for the meaning of the
+       # 'led' setting below.
+       uci set network.@switch_port[-1].led='9'
+
+       ucidef_add_switch_port "switch0" "5"
+       # Port 5 controls the configuration of the WAN LED and the
+       # section does not correspond to a real switch port.
+       #
+       # To toggle the use of green or orange LEDs for the WAN port,
+       # see the LED setting for wndr3700:green:wan in /etc/config/system.
+       #
+       # See the key above for switch port 1 for the meaning of the
+       # 'led' setting below.
+       uci set network.@switch_port[-1].led='2'
+       ;;
+
 *)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"
        ;;