From: Jonas Gorski Date: Mon, 16 Mar 2015 11:52:16 +0000 (+0000) Subject: brcm63xx: base-files: rename board_name to board_id X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9c53e344c0b2b773d6bd4c50948c3cb43715c8d6;p=openwrt%2Fstaging%2Fblocktrron.git brcm63xx: base-files: rename board_name to board_id Rename board_name to board_id to prepare for using board_name as a proper name for the board. Signed-off-by: Jonas Gorski SVN-Revision: 44832 --- diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 2d8f1f55ff..23e9b4f796 100644 --- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -26,7 +26,7 @@ rt2x00_eeprom_extract() { . /lib/brcm63xx.sh -board=$board_name +board=$board_id case "$FIRMWARE" in "rt2x00.eeprom" ) diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds index 69d797e510..441dc68bd5 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds @@ -6,7 +6,7 @@ . /lib/functions/uci-defaults.sh . /lib/brcm63xx.sh -case "$board_name" in +case "$board_id" in 963281T_TEF) ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1" diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network index 6b9736a469..b41ee7e5f9 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network @@ -12,7 +12,7 @@ touch /etc/config/network ucidef_set_interface_loopback -case "$board_name" in +case "$board_id" in 96348W3 |\ 96358-502V |\ diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc index 2840eb1940..c1c0194d33 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -12,7 +12,7 @@ do_fixcrc() { brcm63xx_detect -case "$board_name" in +case "$board_id" in 96328avng |\ 96328A-1241N |\ 96328A-1441N1 |\ diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index 55e6796431..e1d52c2e27 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -4,7 +4,7 @@ # # -board_name="" +board_id="" status_led="" status_led2="" sys_mtd_part="" @@ -12,13 +12,13 @@ brcm63xx_has_reset_button="" ifname="" brcm63xx_detect() { - board_name=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo) + board_id=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo) - if [ "$board_name" = "96358VW" ] && [ -n "$(swconfig dev eth1 help 2>/dev/null)" ]; then - board_name="DVAG3810BN" + if [ "$board_id" = "96358VW" ] && [ -n "$(swconfig dev eth1 help 2>/dev/null)" ]; then + board_id="DVAG3810BN" fi - case "$board_name" in + case "$board_id" in 963281TAN) status_led="963281TAN::power" ifname=eth0