diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-06-05 15:17:01 +0200 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-06-10 11:25:41 +0200 |
| commit | 3d153323ab4f6336a8fab771e6eefe9f61ecbfac (patch) | |
| tree | bf4f807b6e1bf04c915f02b59fe94bf774474b22 | |
| parent | c4fdd4979b7803cd018b7206f1ec53f57cc2d854 (diff) | |
| download | upstream-3d153323ab4f6336a8fab771e6eefe9f61ecbfac.tar.gz upstream-3d153323ab4f6336a8fab771e6eefe9f61ecbfac.tar.bz2 upstream-3d153323ab4f6336a8fab771e6eefe9f61ecbfac.zip | |
ath79: Consistently label info partition
The info/product-info partition, which frequently contains MAC
adresses, is typically assigned the 'info' alias in DTS, but
then labelled with 'info', 'product-info' or 'config'.
This leads to different aliases if used for setting MAC adresses
in DTS compared to when using e.g. mtd_get_mac_binary. Occationally,
also multiple switch-case entries are used just because of different
labelling.
This patch relabels those partitions in ath79 to consistently use
'info'.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
7 files changed, 9 insertions, 15 deletions
diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index b68cf5742b..a2cd0ac3a6 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -330,17 +330,11 @@ ath79_setup_macs() lan_mac=$(macaddr_setbit_la "$wan_mac") ;; tplink,archer-a7-v5|\ - tplink,archer-c7-v5) - base_mac=$(mtd_get_mac_binary info 8) - wan_mac=$(macaddr_add "$base_mac" 1) - ;; - tplink,archer-c7-v4) - base_mac=$(mtd_get_mac_binary config 8) - wan_mac=$(macaddr_add "$base_mac" 1) - ;; + tplink,archer-c7-v4|\ + tplink,archer-c7-v5|\ tplink,tl-wr1043nd-v4|\ tplink,tl-wr1043n-v5) - base_mac=$(mtd_get_mac_binary product-info 8) + base_mac=$(mtd_get_mac_binary info 8) wan_mac=$(macaddr_add "$base_mac" 1) ;; tplink,tl-wr941-v2|\ diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi index a1cf05b05c..aad8428b4a 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi @@ -92,7 +92,7 @@ }; info: partition@30000 { - label = "product-info"; + label = "info"; reg = <0x030000 0x10000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index ebc9177a39..17f07baffd 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -134,7 +134,7 @@ }; info: partition@7e0000 { - label = "product-info"; + label = "info"; reg = <0x7e0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts index b278c9304b..24588d8216 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts @@ -223,7 +223,7 @@ }; info: partition@f00000 { - label = "config"; + label = "info"; reg = <0xf00000 0x0f0000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts index ad55a55e56..36e5ef81db 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_re450-v2.dts @@ -156,7 +156,7 @@ }; info: partition@610000 { - label = "product-info"; + label = "info"; reg = <0x610000 0x020000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts index d983498b6a..9702da4a34 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts @@ -41,7 +41,7 @@ }; info: partition@f00000 { - label = "product-info"; + label = "info"; reg = <0xf00000 0x020000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts index 07361ea2d2..ffe5e0a603 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts @@ -46,7 +46,7 @@ }; info: partition@f50000 { - label = "product-info"; + label = "info"; reg = <0xf50000 0x020000>; read-only; }; |