X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fhotplug.d%2Ffirmware%2F10-rt2x00-eeprom;h=0e02177f7023d9e6779c6d57344fcd5bdd2f92f6;hb=3760b95702b65de9d6d0f6a1029a654e3b11f72f;hp=a54edbabe7ad9aa0e54690c8dbd56c26bbc69d1a;hpb=05209860da4ee1a7857f2ec2ba78af681eeee68d;p=openwrt%2Fopenwrt.git

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 a54edbabe7..0e02177f70 100644
--- 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,55 +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
 
-case "$FIRMWARE" in
-"RT288X.eeprom" | \
-"RT305X.eeprom")
-	. /lib/ramips.sh
+	[ -n "$macaddr" ] || \
+		rt2x00_eeprom_die "invalid wlan mac address"
 
-	local board=$(ramips_board_name)
+	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"
+}
 
-	case $board in
-	dir-300-b1 | \
-	dir-600-b1 | \
-	dir-600-b2)
-		rt2x00_eeprom_extract "devdata" 16384 272
-		;;
+FW="/lib/firmware/$FIRMWARE"
+[ -e "$FW" ] && exit 0
 
-	rt-g32-b1)
-		rt2x00_eeprom_extract "devconf" 0 272
-		;;
+. /lib/ramips.sh
+. /lib/functions/system.sh
 
-	f5d8235-v2)
-		rt2x00_eeprom_extract "u-boot" 262144 272
-		;;
+board=$(ramips_board_name)
 
-	argus-atp52b | \
-	fonera20n | \
-	hw550-3g | \
-	mofi3500-3gn | \
-	pwh2004 | \
-	nw718 | \
-	rt-n15 | \
-	v22rw-2x2 | \
-	wcr150gn | \
-	whr-g300n)
-		rt2x00_eeprom_extract "factory" 0 272
+case "$FIRMWARE" in
+"soc_wmac.eeprom")
+	case $board in
+	*)
+		rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
 		;;
+	esac
+	;;
 
-	*)
-		rt2x00_eeprom_die "board $board is not supported yet"
+"rt2x00pci_1_0.eeprom")
+	case $board in
+	cy-swr1100)
+		rt2x00_eeprom_extract "factory" 8192 512
+		;;
+	br-6475nd | rt-n56u | whr-600d | whr-1166d)
+		rt2x00_eeprom_extract "factory" 32768 512
+		;;
+	tiny-ac)
+		local 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
 	;;