aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-12-17 13:43:25 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-12-22 01:20:33 +0100
commit02f8dbc6fe71c04d89aa5e3129a5ec84903cf395 (patch)
tree10945ad66bb5bcdaeeeb3c31ca39dc190121186c
parentd0efb1ba95f34b70dca759b6cfeb854be43a4edf (diff)
downloadupstream-02f8dbc6fe71c04d89aa5e3129a5ec84903cf395.tar.gz
upstream-02f8dbc6fe71c04d89aa5e3129a5ec84903cf395.tar.bz2
upstream-02f8dbc6fe71c04d89aa5e3129a5ec84903cf395.zip
ramips: add eth0 MAC address for Edimax RG21S
So far, lan/wan MAC address for Edimax RG21S are only read using mtd_get_mac_ascii, so eth0.1 and eth0.2 addresses are set, but eth0 address is random. Since the device's LAN address is the same as for 2.4 GHz, though, this patch set's the eth0 address based on the 2.4 GHz one, which can be extracted by mtd-mac-address. This will also allow to move the label MAC address setup to DT. The setup of lan_mac and wan_mac are kept in 02_network, so those locations are still in use, too. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ramips/dts/mt7621_edimax_rg21s.dts3
-rwxr-xr-xtarget/linux/ramips/mt7621/base-files/etc/board.d/02_network1
2 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts
index be38beef12..f1adf38e3e 100644
--- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts
+++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts
@@ -15,6 +15,7 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
+ label-mac-device = &ethernet;
};
chosen {
@@ -125,6 +126,8 @@
};
&ethernet {
+ mtd-mac-address = <&factory 0x4>;
+
mediatek,portmap = "wllll";
port@5 {
status = "disabled";
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index aad9a60bfe..5c6b5659cb 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -201,7 +201,6 @@ ramips_setup_macs()
edimax,rg21s)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
- label_mac=$(mtd_get_mac_binary factory 0x4)
;;
hiwifi,hc5962)
lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")