aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-05-27 13:22:14 +0000
committerJonas Gorski <jogo@openwrt.org>2012-05-27 13:22:14 +0000
commitdb1ff5c6fa61a9588b8eef5cd3e9e0aa15fcd070 (patch)
treeded0624d4439986c0ef1e89a97fd9dde74e1b095 /target/linux
parent72b4fdecc9bb33aea7b6a58dcefd4553d093f266 (diff)
downloadupstream-db1ff5c6fa61a9588b8eef5cd3e9e0aa15fcd070.tar.gz
upstream-db1ff5c6fa61a9588b8eef5cd3e9e0aa15fcd070.tar.bz2
upstream-db1ff5c6fa61a9588b8eef5cd3e9e0aa15fcd070.zip
bcm63xx: setup network config through uci-defaults
SVN-Revision: 31873
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/96348A-122/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/96358-502V/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/CPVA642/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/CT536_CT5621/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/D-4P-W/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/DVAG3810BN/network29
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/SPW500V/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/V2110/network14
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/generic/network18
-rwxr-xr-xtarget/linux/brcm63xx/base-files/etc/uci-defaults/network42
11 files changed, 42 insertions, 159 deletions
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
index ef1f2882b7..0000000000
--- 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
index a35fd2ef9a..0000000000
--- 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
index a35fd2ef9a..0000000000
--- 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
index a35fd2ef9a..0000000000
--- 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
index a35fd2ef9a..0000000000
--- 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
index fa4844d1ac..0000000000
--- 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
index 181ca011ca..0000000000
--- 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
index a35fd2ef9a..0000000000
--- 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
index 47581409d5..0000000000
--- 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
index bc2c69b7c9..0000000000
--- 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
index 0000000000..f5fd9cba2a
--- /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