ar71xx: create even more network configs from the uci-defaults script

Create the default network configuration dynamically for the
AR724x/AR9331 boards. Some other boards are using the same
configuration, so convert those as well.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28820 3c298f89-4303-0410-b956-a3cf2f4a3e73

17 files changed, 45 insertions, 394 deletions

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/ap121-mini/network b/target/linux/ar71xx/base-files/etc/defconfig/ap121-mini/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/ap121-mini/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/ap121/network b/target/linux/ar71xx/base-files/etc/defconfig/ap121/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/ap121/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/ap96/network b/target/linux/ar71xx/base-files/etc/defconfig/ap96/network
deleted file mode 100644
index 649d7a4ea1..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/ap96/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
-	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	eth0
-	option reset	1
-	option enable_vlan 1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/dir-600-a1/network b/target/linux/ar71xx/base-files/etc/defconfig/dir-600-a1/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/dir-600-a1/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/dir-615-c1/network b/target/linux/ar71xx/base-files/etc/defconfig/dir-615-c1/network
deleted file mode 100644
index 509138e774..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/dir-615-c1/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
-	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	eth0
-	option reset	1
-	option enable_vlan 1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	'0 1 2 3 4'
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/ja76pf/network b/target/linux/ar71xx/base-files/etc/defconfig/ja76pf/network
deleted file mode 100644
index b60053f019..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/ja76pf/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
-	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	eth0
-	option reset	1
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/rb-750/network b/target/linux/ar71xx/base-files/etc/defconfig/rb-750/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/rb-750/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tew-632brp/network b/target/linux/ar71xx/base-files/etc/defconfig/tew-632brp/network
deleted file mode 100644
index 509138e774..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tew-632brp/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
-	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	eth0
-	option reset	1
-	option enable_vlan 1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	'0 1 2 3 4'
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3220/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3220/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3220/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3420/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3420/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-mr3420/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd-v4/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd-v4/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd-v4/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr741nd/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/whr-g301n/network b/target/linux/ar71xx/base-files/etc/defconfig/whr-g301n/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/whr-g301n/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-g300n/network b/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-g300n/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-g300n/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-gn/network b/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-gn/network
deleted file mode 100644
index de201bf5ec..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/whr-hp-gn/network
+++ /dev/null
@@ -1,24 +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
-	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 eth0
-	option enable_vlan	1
-
-config switch_vlan
-	option device	eth0
-	option vlan	1
-	option ports	"0 1 2 3 4"
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-ag300h/network b/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-ag300h/network
deleted file mode 100644
index 379e6c4da7..0000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-ag300h/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
-	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	eth0
-	option reset	1
-	option enable_vlan 1
-
-config switch_vlan
-	option device	eth0
-	option vlan 	1
-	option ports	'0 1 2 3 4'
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network
index 63efc88de1..f78f64796f 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network
@@ -44,6 +44,30 @@ set_interfaces_lan_wan() {
 	set_interface_wan "$wan_ifname"
 }
 
+add_switch() {
+	local name=$1
+	local reset=$2
+	local enable=$3
+	uci batch <<EOF
+add network switch
+set network.@switch[-1].name='$name'
+set network.@switch[-1].reset='$reset'
+set network.@switch[-1].enable_vlan='$enable'
+EOF
+}
+
+add_switch_vlan() {
+	local device=$1
+	local vlan=$2
+	local ports=$3
+	uci batch <<EOF
+add network switch_vlan
+set network.@switch_vlan[-1].device='$device'
+set network.@switch_vlan[-1].vlan='$vlan'
+set network.@switch_vlan[-1].ports='$ports'
+EOF
+}
+
 [ -e /etc/config/network ] && exit 0
 
 touch /etc/config/network
@@ -73,6 +97,27 @@ routerstation)
 	set_interfaces_lan_wan "eth1" "eth0"
 	;;
 
+ap121 |\
+ap121-mini |\
+ap96 |\
+dir-600-a1 |\
+dir-615-c1 |\
+ja76pf |\
+rb750 |\
+tew-632brp |\
+tl-mr3220 |\
+tl-mr3420 |\
+tl-wr741nd |\
+tl-wr741nd-v4 |\
+whr-g301n |\
+whr-hp-g300n |\
+whr-hp-gn |\
+wzr-hp-ag300h)
+	set_interfaces_lan_wan "eth0" "eth1"
+	add_switch "eth0" "1" "1"
+	add_switch_vlan "eth0" "1" "0 1 2 3 4"
+	;;
+
 *)
 	set_interfaces_lan_wan "eth0" "eth1"
 	;;