bcm63xx: setup network config through uci-defaults

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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/96348A-122/network b/target/linux/brcm63xx/base-files/etc/defconfig/96348A-122/network
deleted file mode 100644 (file)
index ef1f288..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/96348A-122/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-
-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 type     bridge
-    option ifname   eth0
-    option proto    static
-    option ipaddr   192.168.1.1
-    option netmask  255.255.255.0

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/96358-502V/network b/target/linux/brcm63xx/base-files/etc/defconfig/96358-502V/network
deleted file mode 100644 (file)
index a35fd2e..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/96358-502V/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network b/target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network
deleted file mode 100644 (file)
index a35fd2e..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/CPVA642/network b/target/linux/brcm63xx/base-files/etc/defconfig/CPVA642/network
deleted file mode 100644 (file)
index a35fd2e..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/CPVA642/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/CT536_CT5621/network b/target/linux/brcm63xx/base-files/etc/defconfig/CT536_CT5621/network
deleted file mode 100644 (file)
index a35fd2e..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/CT536_CT5621/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/D-4P-W/network b/target/linux/brcm63xx/base-files/etc/defconfig/D-4P-W/network
deleted file mode 100644 (file)
index fa4844d..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/D-4P-W/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2010 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/DVAG3810BN/network b/target/linux/brcm63xx/base-files/etc/defconfig/DVAG3810BN/network
deleted file mode 100644 (file)
index 181ca01..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/DVAG3810BN/network
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-
-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 type     bridge
-        option ifname   eth1.1
-        option proto    static
-        option ipaddr   192.168.1.1
-        option netmask  255.255.255.0
-        option nat      1
-
-config interface wan
-       option ifname   eth0
-       option proto    dhcp
-
-config switch  eth1
-       option  enable  1
-       option  enable_vlan 1
-       option  reset   1
-
-config switch_vlan
-       option  vlan    1
-       option  device  eth1
-       option  ports   "0 1 2 3 5t"

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/SPW500V/network b/target/linux/brcm63xx/base-files/etc/defconfig/SPW500V/network
deleted file mode 100644 (file)
index a35fd2e..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/SPW500V/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/V2110/network b/target/linux/brcm63xx/base-files/etc/defconfig/V2110/network
deleted file mode 100644 (file)
index 4758140..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/V2110/network
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2011 OpenWrt.org
-
-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

diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/generic/network b/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
deleted file mode 100644 (file)
index bc2c69b..0000000
--- a/target/linux/brcm63xx/base-files/etc/defconfig/generic/network
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-
-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 type     bridge
-        option ifname   eth1
-        option proto    static
-        option ipaddr   192.168.1.1
-        option netmask  255.255.255.0
-
-config interface wan
-       option ifname   eth0
-       option proto    dhcp

diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/network b/target/linux/brcm63xx/base-files/etc/uci-defaults/network
new file mode 100755 (executable)
index 0000000..f5fd9cb
--- /dev/null
+++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/network
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
+. /lib/functions/uci-defaults.sh
+. /lib/brcm63xx.sh
+
+ucidef_set_interface_loopback
+
+case "$board_name" in
+
+96348A-122 |\
+96358-502V |\
+AW4139 |\
+CPVA642 |\
+CT536_CT5621 |\
+D-4P-W |\
+SPW500V |\
+V2110)
+       ucidef_set_interface_lan "eth0"
+       ;;
+
+DVG3810BN)
+       ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+       ucidef_add_switch "eth1" "1" "1"
+       ucidef_add_switch_vlan "eth1" "1" "0 1 2 3 4 5t"
+       ;;
+
+*)
+       ucidef_set_interfaces_lan_wan "eth1" "eth0"
+       ;;
+
+esac
+
+uci commit network
+
+exit 0