aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-01 22:48:37 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-01 22:48:37 +0000
commitc42e834587d33b3bec2ab9b0c2ba9e5a0b0e894a (patch)
treec724798cbc25282fe825b8f4962ae83ac43e62f7
parent576ea7dee871b10d835305fbf2880bf1f2d894ff (diff)
downloadmaster-187ad058-c42e834587d33b3bec2ab9b0c2ba9e5a0b0e894a.tar.gz
master-187ad058-c42e834587d33b3bec2ab9b0c2ba9e5a0b0e894a.tar.bz2
master-187ad058-c42e834587d33b3bec2ab9b0c2ba9e5a0b0e894a.zip
ramips: setup bc2 mac addresses from the generic network script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29377 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ramips/base-files/etc/uci-defaults/bc236
-rwxr-xr-xtarget/linux/ramips/base-files/etc/uci-defaults/network1
2 files changed, 1 insertions, 36 deletions
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/bc2 b/target/linux/ramips/base-files/etc/uci-defaults/bc2
deleted file mode 100644
index 3a93df2b71..0000000000
--- a/target/linux/ramips/base-files/etc/uci-defaults/bc2
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-bc2_set_macs() {
- local part
- local lan_mac
- local wan_mac
-
- [ -z $(which maccalc) ] && return
-
- . /etc/functions.sh
-
- part=$(find_mtd_part "factory")
- [ -z $part ] && return
-
- lan_mac=$(dd bs=1 skip=4 count=6 if=$part 2>/dev/null | maccalc bin2mac)
- [ -z $lan_mac ] && return
-
- wan_mac=$(maccalc add $lan_mac 1)
-
- uci batch <<EOF
-set network.lan.macaddr='$lan_mac'
-set network.wan.macaddr='$wan_mac'
-commit network
-EOF
-}
-
-. /lib/ramips.sh
-
-board=$(ramips_board_name)
-
-if [ "${board}" == "bc2" ]; then
- bc2_set_macs
-fi
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index cd0feaf00b..e58accd181 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -115,6 +115,7 @@ case $board in
set_macs_only_lan_from_mtd "u-boot" 262148
;;
argus-atp52b | \
+ b2c | \
nw718)
create_lan_wan
set_macs_only_lan_from_mtd "factory" 4