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>

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 2d1ac2e872d51860565cfcf8ce46485103048a4d..b68efcbba182aa52a86d642aecbfa9142adb65e0 100644 (file)
--- 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!"