X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fhotplug.d%2Ffirmware%2F10-rt2x00-eeprom;h=711b8388badcae6c6a6b6d343bec52573854cc76;hp=40785287db1b3b27246072dddd1b70a260e91d99;hb=37af596593b0e84d0a076ab8f173066e3d7bc810;hpb=d543f4b77186e841b11406adf33bffb8c0acf08f

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 40785287db..711b8388ba 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,8 +11,6 @@ rt2x00_eeprom_extract() {
 	local count=$3
 	local mtd
 
-	. /lib/functions.sh
-
 	mtd=$(find_mtd_part $part)
 	[ -n "$mtd" ] || \
 		rt2x00_eeprom_die "no mtd device found for partition $part"
@@ -21,98 +19,56 @@ rt2x00_eeprom_extract() {
 		rt2x00_eeprom_die "failed to extract from $mtd"
 }
 
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
+jboot_eeprom_extract() {
+	local part=$1
+	local offset=$2
+	local mtd
 
-. /lib/ramips.sh
+	mtd=$(find_mtd_part $part)
+	[ -n "$mtd" ] || \
+		rt2x00_eeprom_die "no mtd device found for partition $part"
 
-board=$(ramips_board_name)
+	jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE  2>/dev/null || \
+		rt2x00_eeprom_die "failed to extract from $mtd"
+}
 
-case "$FIRMWARE" in
-"soc_wmac.eeprom")
-	case $board in
-	dir-300-b1 | \
-	dir-600-b1 | \
-	dir-600-b2 | \
-	dir-615-d)
-		rt2x00_eeprom_extract "devdata" 16384 272
-		;;
+rt2x00_eeprom_set_macaddr() {
+	local macaddr=$1
 
-	dap-1350)
-		rt2x00_eeprom_extract "devdata" 0 272
-		;;
+	[ -n "$macaddr" ] || \
+		rt2x00_eeprom_die "invalid wlan mac address"
 
-	rt-n10-plus | \
-	rt-g32-b1)
-		rt2x00_eeprom_extract "devconf" 0 272
-		;;
+	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"
+}
 
-	f5d8235-v1 | \
-	f5d8235-v2)
-		rt2x00_eeprom_extract "u-boot" 262144 272
-		;;
+FW="/lib/firmware/$FIRMWARE"
+[ -e "$FW" ] && exit 0
 
-	3g-6200n | \
-	3g300m | \
-	air3gii | \
-	all0239-3g | \
-	all0256n | \
-	all5002 | \
-	argus-atp52b | \
-	bc2 | \
-	br6425 | \
-	broadway | \
-	br6524n | \
-	carambola | \
-	dir-615-h1 | \
-	dir-620-a1 | \
-	esr-9753 | \
-	fonera20n | \
-	rt-n13u | \
-	freestation5 | \
-	hw550-3g | \
-	mofi3500-3gn | \
-	pwh2004 | \
-	nbg-419n | \
-	nw718 | \
-	omni-emb | \
-	omni-emb-hpm | \
-	psr-680w | \
-	rt-n15 | \
-	rt-n56u | \
-	sl-r7205 | \
-	v11st-fe | \
-	v22rw-2x2 | \
-	w306r-v20 | \
-	w502u | \
-	wcr-150gn | \
-	whr-g300n | \
-	wl-330n | \
-	wl-330n3g | \
-	wl-351 | \
-	wli-tx4-ag300n | \
-	wr512-3gn | \
-	wr6202 | \
-	mzk-w300nh2 | \
-	ur-326n4g | \
-	ur-336un | \
-	xdxrn502j)
-		rt2x00_eeprom_extract "factory" 0 272
-		;;
+. /lib/functions.sh
+. /lib/functions/system.sh
 
-	wl341v3)
-		rt2x00_eeprom_extract "board-nvram" 64880 272
-		;;
-
-	*)
-		rt2x00_eeprom_die "board $board is not supported yet"
-		;;
-	esac
-	;;
+board=$(board_name)
 
-"rt2x00pci_1_0.eeprom")
+case "$FIRMWARE" in
+"soc_wmac.eeprom")
 	case $board in
-	rt-n56u)
-		rt2x00_eeprom_extract "factory" 32768 272
+	dlink,dwr-116-a1|\
+	dlink,dwr-118-a2|\
+	dlink,dwr-921-c1)
+		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
+		;;
+	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
+		;;
+	*)
+		rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!"
 		;;
 	esac
 	;;