KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm47xx: parse model from cpuinfo

Browse source 
Instead of looking into the proc entry provided by broadcom-diag use
the board info from /proc/cpuinfo to get the board we are on.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 39256
This commit is contained in:
Hauke Mehrtens 2014-01-12 18:56:57 +00:00
parent bcdea80b0b
commit f912b47931
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/brcm47xx/base-files/etc/init.d/netconfig
View file

@ -45,6 +45,7 @@ start() {
local cpuport=5 local cpuport=5
[ -e /sbin/swconfig ] && cpuport=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p") [ -e /sbin/swconfig ] && cpuport=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p")
local model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)
local network_defs=`( local network_defs=`(
if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then
@ -53,7 +54,7 @@ start() {
else else
strings "$(find_mtd_part nvram)" strings "$(find_mtd_part nvram)"
fi fi
) | awk -v cpuport="$cpuport" ' ) | awk -v cpuport="$cpuport" -v model="$model" '
function macinc(mac, maca, i, result) { function macinc(mac, maca, i, result) {
split(mac, maca, ":") split(mac, maca, ":")
for (i = 1; i <= 6; i++) maca[i] = "0x" maca[i] for (i = 1; i <= 6; i++) maca[i] = "0x" maca[i]
@ -74,8 +75,6 @@ start() {
c["wan_ifname"]="eth0.2" c["wan_ifname"]="eth0.2"
c["vlan1ports"]="1 2 3 4 5t" c["vlan1ports"]="1 2 3 4 5t"
c["vlan2ports"]="0 5t" c["vlan2ports"]="0 5t"
getline < "/proc/diag/model"
model=$0
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (mac_check != "") mac_check = mac_check ":" if (mac_check != "") mac_check = mac_check ":"
mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]" mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]"