aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/base-files
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-08-09 17:45:12 +0200
committerAlexander Couzens <lynxis@fe80.eu>2019-08-14 12:10:12 +0200
commit75bfc393ba6cffd783e723d3115c25b70836c116 (patch)
treec3dc6d8b544ec5b5e4bb4d6c33f323d43cb0e8fc /target/linux/apm821xx/base-files
parent07926d7def59e5684b488e9b614342edc19e7eb2 (diff)
downloadupstream-75bfc393ba6cffd783e723d3115c25b70836c116.tar.gz
upstream-75bfc393ba6cffd783e723d3115c25b70836c116.tar.bz2
upstream-75bfc393ba6cffd783e723d3115c25b70836c116.zip
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 <lynxis@fe80.eu> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/apm821xx/base-files')
-rw-r--r--target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom4
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 6d2d18658d..b3b8886720 100644
--- a/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -59,7 +59,7 @@ case "$FIRMWARE" in
ath9k_ubi_eeprom_extract "caldata" 20480 4096
else
ath9k_eeprom_extract "wifi_data" 20480 4096
- ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 12)
+ ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc)
fi
;;
*)
@@ -77,7 +77,7 @@ case "$FIRMWARE" in
ath9k_ubi_eeprom_extract "caldata" 4096 4096
else
ath9k_eeprom_extract "wifi_data" 4096 4096
- ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0)
+ ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0)
fi
;;
*)
diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
index 1a27930d24..11955dd5a2 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
+++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
@@ -6,7 +6,7 @@ preinit_set_mac_address() {
case $(board_name) in
meraki,mr24|\
meraki,mx60)
- mac_lan=$(mtd_get_mac_binary_ubi board-config 102)
+ mac_lan=$(mtd_get_mac_binary_ubi board-config 0x66)
[ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan"
;;
esac