ramips: setup bc2 mac addresses from the generic network script

SVN-Revision: 29377

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 (file)
index 3a93df2..0000000
--- 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 cd0feaf00b7b2b607a171f1441927ae82cbebe6c..e58accd181f7ecbb4e5044c48642533358a6da78 100755 (executable)
--- 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