ramips/mt7620: Synchronize Makefiles with DTS compatible

[openwrt/staging/mkresin.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 1e25643cb75c3bf12a3bb17bc0773ac0e7529adc..6e68f7603d9dd2324064f5e317569681b631d738 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
@@ -15,7 +15,20 @@ rt2x00_eeprom_extract() {
        [ -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 2>/dev/null || \
+       dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
+               rt2x00_eeprom_die "failed to extract from $mtd"
+}
+
+jboot_eeprom_extract() {
+       local part=$1
+       local offset=$2
+       local mtd
+
+       mtd=$(find_mtd_part $part)
+       [ -n "$mtd" ] || \
+               rt2x00_eeprom_die "no mtd device found for partition $part"
+
+       jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE  2>/dev/null || \
                rt2x00_eeprom_die "failed to extract from $mtd"
 }
 
@@ -26,7 +39,7 @@ rt2x00_eeprom_set_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 || \
+                               conv=notrunc oflag=seek_bytes bs=6 seek=4 count=1 2>/dev/null || \
                rt2x00_eeprom_die "failed to write mac address to eeprom file"
 }
 
@@ -41,7 +54,19 @@ board=$(board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
        case $board in
-       tiny-ac)
+       dlink,dir-510l|\
+       dlink,dwr-116-a1|\
+       dlink,dwr-118-a1|\
+       dlink,dwr-118-a2|\
+       dlink,dwr-921-c1|\
+       dlink,dwr-922-e2|\
+       lava,lr-25g001)
+               wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000)
+               wifi_mac=$(macaddr_add "$wan_mac" 1)
+               jboot_eeprom_extract "config" 0xE000
+               rt2x00_eeprom_set_macaddr $wifi_mac
+               ;;
+       dovado,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