ramips: do not "local" variables outside of a function

[openwrt/staging/rmilecki.git] / target / linux / ramips / base-files / etc / hotplug.d / firmware / 10-rt2x00-eeprom

diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 65b2cd39c8ad44f1e796ce1005925734557e0fc8..4c8beac066a60fcf381c0dd594d14d68553814a6 100644 (file)
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -11,78 +11,56 @@ rt2x00_eeprom_extract() {
        local count=$3
        local mtd
 
-       . /etc/functions.sh
+       . /lib/functions.sh
 
        mtd=$(find_mtd_part $part)
        [ -n "$mtd" ] || \
                rt2x00_eeprom_die "no mtd device found for partition $part"
 
-       dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count || \
+       dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \
                rt2x00_eeprom_die "failed to extract from $mtd"
 }
 
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
+rt2x00_eeprom_set_macaddr() {
+       local macaddr=$1
+
+       [ -n "$macaddr" ] || \
+               rt2x00_eeprom_die "invalid wlan mac address"
+
+       macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \
+                               conv=notrunc bs=1 seek=4 count=6 2>/dev/null || \
+               rt2x00_eeprom_die "failed to write mac address to eeprom file"
+}
+
+FW="/lib/firmware/$FIRMWARE"
+[ -e "$FW" ] && exit 0
 
 . /lib/ramips.sh
+. /lib/functions/system.sh
 
 board=$(ramips_board_name)
 
 case "$FIRMWARE" in
-"RT288X.eeprom" | \
-"RT305X.eeprom")
+"soc_wmac.eeprom")
        case $board in
-       dir-300-b1 | \
-       dir-600-b1 | \
-       dir-600-b2)
-               rt2x00_eeprom_extract "devdata" 16384 272
-               ;;
-
-       rt-g32-b1)
-               rt2x00_eeprom_extract "devconf" 0 272
-               ;;
-
-       f5d8235-v1 | \
-       f5d8235-v2)
-               rt2x00_eeprom_extract "u-boot" 262144 272
-               ;;
-
-       all0256n | \
-       argus-atp52b | \
-       bc2 | \
-       esr-9753 | \
-       fonera20n | \
-       hw550-3g | \
-       mofi3500-3gn | \
-       pwh2004 | \
-       nbg-419n | \
-       nw718 | \
-       omni-emb | \
-       rt-n15 | \
-       v22rw-2x2 | \
-       w502u | \
-       wcr-150gn | \
-       whr-g300n | \
-       wl-351 | \
-       wli-tx4-ag300n | \
-       wr512-3gn | \
-       wr6202)
-               rt2x00_eeprom_extract "factory" 0 272
-               ;;
-
-       wl341v3)
-               rt2x00_eeprom_extract "board-nvram" 64880 272
-               ;;
-
        *)
-               rt2x00_eeprom_die "board $board is not supported yet"
+               rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
                ;;
        esac
        ;;
 
 "rt2x00pci_1_0.eeprom")
        case $board in
-       rt-n56u)
-               rt2x00_eeprom_extract "factory" 32768 272
+       cy-swr1100)
+               rt2x00_eeprom_extract "factory" 8192 512
+               ;;
+       br-6475nd | rt-n56u | whr-600d | whr-1166d)
+               rt2x00_eeprom_extract "factory" 32768 512
+               ;;
+       tiny-ac)
+               wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
+               rt2x00_eeprom_extract "factory" 0 512
+               rt2x00_eeprom_set_macaddr $wifi_mac
                ;;
        esac
        ;;