From 75bfc393ba6cffd783e723d3115c25b70836c116 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 9 Aug 2019 17:45:12 +0200 Subject: treewide: convert MAC address location offsets to hexadecimal This changes the offsets for the MAC address location in mtd_get_mac_binary* and mtd_get_mac_text to hexadecimal notation. This will be much clearer for the reader when numbers are big, and will also match the style used for mtd-mac-address in DTS files. (e.g. 0x1006 and 0x5006 are much more useful than 4102 and 20486) Acked-by: Alexander Couzens Signed-off-by: Adrian Schmutzler --- target/linux/mpc85xx/base-files/etc/board.d/02_network | 2 +- target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/mpc85xx') diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network index d6b4eebf14..f907fd2edb 100755 --- a/target/linux/mpc85xx/base-files/etc/board.d/02_network +++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network @@ -21,7 +21,7 @@ ocedo,panda) tplink,tl-wdr4900-v1) ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" - ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 332)" + ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 0x14c)" ;; *) ucidef_set_interfaces_lan_wan "eth0" "eth1" diff --git a/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 3e6488b4c7..b02c891cbf 100644 --- a/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -26,7 +26,7 @@ tpl_set_wireless_mac() local offset=$1 local mac - mac=$(mtd_get_mac_binary u-boot 326656) + mac=$(mtd_get_mac_binary u-boot 0x4fc00) mac=$(macaddr_add $mac $offset) macaddr_2bin $mac | dd bs=1 count=6 seek=2 conv=notrunc of=$FW_FILE 2>/dev/null -- cgit v1.2.3