diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-12 20:54:04 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-16 17:28:48 +0200 |
| commit | a99614a44f205f48db4278988566d2b6b2b96295 (patch) | |
| tree | e7f93a3eb51c3366b9ceb503f1ba676c85185bd3 /target/linux/ath79/generic/base-files/etc/hotplug.d | |
| parent | cb9bb908de1772d52bec73e6efffb0b803c8e41e (diff) | |
| download | upstream-a99614a44f205f48db4278988566d2b6b2b96295.tar.gz upstream-a99614a44f205f48db4278988566d2b6b2b96295.tar.bz2 upstream-a99614a44f205f48db4278988566d2b6b2b96295.zip | |
ath79: consistently use "info" label for default-mac partition
The tp-link safeloader devices typically contain a partition
"default-mac" which stores the MAC addresses. It is followed by other
partitions containing device info, like
{"default-mac", 0x610000, 0x00020},
{"pin", 0x610100, 0x00020},
{"product-info", 0x611100, 0x01000},
In DTS, we typically assign a 0x10000 sized partition for these,
which is mostly labelled "mac" or "info". In rarer cases, the
partitions have been enclosed in a larger "tplink" or "config"
partition.
However, when comparing different devices, the implementation appears
relatively arbitrary at the moment.
Thus, this PR aims at harmonizing these partitions by always using
the name "info" for the DTS partition containing "default-mac".
"info" is preferred over "mac" as we never just have "default-mac"
alone, but always some other device-info partitions as well.
While at it, this also establishes a similar partitioning for the
few devices where the "info" partitions are part of a bigger
unspecific "config" partition or similar.
Besides the harmonization itself, this also allows to merge a few
cases in 11-ath10k-caldata.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79/generic/base-files/etc/hotplug.d')
| -rw-r--r-- | target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 39b2d0ba49..89a64fbf35 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -98,7 +98,8 @@ case "$FIRMWARE" in tplink,archer-c2-v3|\ tplink,archer-c7-v4|\ tplink,archer-c7-v5|\ - tplink,archer-c25-v1) + tplink,archer-c25-v1|\ + tplink,tl-wr902ac-v1) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ;; @@ -118,7 +119,7 @@ case "$FIRMWARE" in ;; tplink,re350k-v1) caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2) + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +2) ;; tplink,re355-v1|\ tplink,re450-v1) @@ -134,10 +135,6 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x0fc00) +1) ;; - tplink,tl-wr902ac-v1) - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary tplink 0x8) -1) - ;; esac ;; "ath10k/cal-pci-0000:01:00.0.bin") @@ -195,19 +192,14 @@ case "$FIRMWARE" in tplink,archer-c6-v2|\ tplink,archer-c6-v2-us) caldata_extract "art" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1) + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; + tplink,eap225-wall-v2|\ tplink,tl-wpa8630p-v2-eu|\ tplink,tl-wpa8630p-v2-int) caldata_extract "art" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) +1) - ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ - /lib/firmware/ath10k/QCA9888/hw2.0/board.bin - ;; - tplink,eap225-wall-v2) - caldata_extract "art" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin |