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>
This commit is contained in:
Adrian Schmutzler 2019-06-05 15:17:01 +02:00 committed by Christian Lamparter
parent c4fdd4979b
commit 3d153323ab
7 changed files with 9 additions and 15 deletions

View File

@ -330,17 +330,11 @@ ath79_setup_macs()
lan_mac=$(macaddr_setbit_la "$wan_mac") lan_mac=$(macaddr_setbit_la "$wan_mac")
;; ;;
tplink,archer-a7-v5|\ tplink,archer-a7-v5|\
tplink,archer-c7-v5) tplink,archer-c7-v4|\
base_mac=$(mtd_get_mac_binary info 8) tplink,archer-c7-v5|\
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,tl-wr1043nd-v4|\ tplink,tl-wr1043nd-v4|\
tplink,tl-wr1043n-v5) 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) wan_mac=$(macaddr_add "$base_mac" 1)
;; ;;
tplink,tl-wr941-v2|\ tplink,tl-wr941-v2|\

View File

@ -92,7 +92,7 @@
}; };
info: partition@30000 { info: partition@30000 {
label = "product-info"; label = "info";
reg = <0x030000 0x10000>; reg = <0x030000 0x10000>;
read-only; read-only;
}; };

View File

@ -134,7 +134,7 @@
}; };
info: partition@7e0000 { info: partition@7e0000 {
label = "product-info"; label = "info";
reg = <0x7e0000 0x010000>; reg = <0x7e0000 0x010000>;
read-only; read-only;
}; };

View File

@ -223,7 +223,7 @@
}; };
info: partition@f00000 { info: partition@f00000 {
label = "config"; label = "info";
reg = <0xf00000 0x0f0000>; reg = <0xf00000 0x0f0000>;
read-only; read-only;
}; };

View File

@ -156,7 +156,7 @@
}; };
info: partition@610000 { info: partition@610000 {
label = "product-info"; label = "info";
reg = <0x610000 0x020000>; reg = <0x610000 0x020000>;
read-only; read-only;
}; };

View File

@ -41,7 +41,7 @@
}; };
info: partition@f00000 { info: partition@f00000 {
label = "product-info"; label = "info";
reg = <0xf00000 0x020000>; reg = <0xf00000 0x020000>;
read-only; read-only;
}; };

View File

@ -46,7 +46,7 @@
}; };
info: partition@f50000 { info: partition@f50000 {
label = "product-info"; label = "info";
reg = <0xf50000 0x020000>; reg = <0xf50000 0x020000>;
read-only; read-only;
}; };