From 2c54f4168e023dafcc98be10e0b3530ef198c145 Mon Sep 17 00:00:00 2001
From: jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 27 May 2012 13:22:08 +0000
Subject: bcm63xx: use the exact board id as board identification string
No need to keep the bcm63xx/ at the start or the chipid info at the end.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31871 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../base-files/etc/uci-defaults/brcm63xx_fixcrc.sh | 7 +++++--
target/linux/brcm63xx/base-files/lib/brcm63xx.sh | 24 +++++++++++-----------
2 files changed, 17 insertions(+), 14 deletions(-)
(limited to 'target/linux')
diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh
index 965ddba16..e63ecfde4 100755
--- a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh
+++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh
@@ -13,8 +13,11 @@ do_fixcrc() {
brcm63xx_detect
case "$board_name" in
- "bcm63xx/CPVA642 "* | "bcm63xx/MAGIC "* | "bcm63xx/V2500V_BB "* | \
- "bcm63xx/V2110 "* | "bcm63xx/CPVA502+ "*)
+ "CPVA502+" |\
+ CPVA642 |\
+ MAGIC |\
+ V2110 |\
+ V2500V_BB)
do_fixcrc
;;
esac
diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index ed3447d01..488aed874 100755
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -11,60 +11,60 @@ sys_mtd_part=""
brcm63xx_has_reset_button=""
brcm63xx_detect() {
- board_name=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo)
+ board_name=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo)
case "$board_name" in
- "bcm63xx/96348GW "*)
+ 96348GW)
status_led="power"
brcm63xx_has_reset_button="true"
ifname=eth1
;;
- "bcm63xx/GW6000 "*)
+ GW6000)
brcm63xx_has_reset_button="true"
ifname=eth1
;;
- "bcm63xx/GW6200 "*)
+ GW6200)
status_led="line1"
status_led2="tel"
brcm63xx_has_reset_button="true"
ifname=eth1
;;
- "bcm63xx/96348GW-11 "*)
+ 96348GW-11)
status_led="power"
brcm63xx_has_reset_button="true"
ifname=eth1
;;
- "bcm63xx/CT536_CT5621 "*)
+ CT536_CT5621)
status_led="power"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/SPW500V "*)
+ SPW500V)
status_led="power:green"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/AW4139 "*)
+ AW4139)
status_led="dsl-274xb:green:power"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/96358-502V "*)
+ 96358-502V)
status_led="spw303v:green:power+adsl"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/V2110 "*)
+ V2110)
status_led="V2110:power:green"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/CPVA642 "* )
+ CPVA642)
status_led="power:green"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/D-4P-W "*)
+ D-4P-W)
status_led="power:green"
brcm63xx_has_reset_button="true"
ifname=eth0
--
cgit v1.2.3