aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-05-27 13:22:08 +0000
committerJonas Gorski <jogo@openwrt.org>2012-05-27 13:22:08 +0000
commit1148159a4fb24c481dac066cd28d5b572991eb15 (patch)
treed1c7a760275d70ff3fc1e26b75c620336499c87b /target/linux
parentcb7839b1f600d0c78e1974c194e5933480f3ab63 (diff)
downloadupstream-1148159a4fb24c481dac066cd28d5b572991eb15.tar.gz
upstream-1148159a4fb24c481dac066cd28d5b572991eb15.tar.bz2
upstream-1148159a4fb24c481dac066cd28d5b572991eb15.zip
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
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh7
-rwxr-xr-xtarget/linux/brcm63xx/base-files/lib/brcm63xx.sh24
2 files changed, 17 insertions, 14 deletions
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 965ddba16c..e63ecfde4d 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 ed3447d013..488aed874f 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