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 <jogo@openwrt.org>
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 2d8f1f55ff0cc8b9bc65539e7570aea9b052877c..23e9b4f796956d03cb9e495a753826fa8bce0c6d 100644 (file)
--- 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 69d797e51060dd99d3fedb383594370e0e32be64..441dc68bd5e9c6ecd27dd38672081bb47aa1c7dd 100644 (file)
--- 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 6b9736a4690f02fe9bc9ed7d9a4ca0b9aa077896..b41ee7e5f9ff6c0419cc69a3ffbc5dfd31c6b319 100644 (file)
--- 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 2840eb1940e4a5eb3a5b7a526526c9c80acf754b..c1c0194d3379f26fb1c8913d851d0c20c60f29b9 100644 (file)
--- 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 55e6796431fb008848247e43f3a76d7ae0e6b189..e1d52c2e27a090d0eae898565e7d7975a95f489b 100755 (executable)
--- 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