summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2025-02-08 07:39:13 +0000
committerHauke Mehrtens2025-02-12 23:26:23 +0000
commit43bc5e6e122b06eb9bfd22cf0bdf3212b84073f3 (patch)
treefc917efdb3f8e077777b2cf31003eaa226e2bff5
parent094b6f593fb4943005e13e2f8581e66bb7c2c8cf (diff)
downloadopenwrt-43bc5e6e122b06eb9bfd22cf0bdf3212b84073f3.tar.gz
Revert "Revert "ramips: mt7620: fix patching mac address in caldata""
This reverts commit f628467dfd6b32ead172d33a2593f04901395343. The initial fix was correct. However, a recently introduced bug in base-files can cause some unexpected byte overwriting in eeprom. Since it has been fixed, let's accept this patch again. Signed-off-by: Shiji Yang <yangshiji66@qq.com> Link: https://github.com/openwrt/openwrt/pull/17892 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 2d1ac2e872..b68efcbba1 100644
--- a/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/mt7620/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -34,12 +34,12 @@ case "$FIRMWARE" in
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
- caldata_patch_mac $wifi_mac 0x4
+ caldata_patch_data "${wifi_mac//:/}" 0x4
;;
dovado,tiny-ac)
wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
caldata_extract "factory" 0x0 0x200
- caldata_patch_mac $wifi_mac 0x4
+ caldata_patch_data "${wifi_mac//:/}" 0x4
;;
*)
caldata_die "Please define mtd-eeprom in $board DTS file!"