diff mbox series

[3/3] realtek: use full range of assigned MAC addresses

Message ID 20210412122725.29430-4-bjorn@mork.no
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series realtek: fix default network configuration | expand

Commit Message

Bjørn Mork April 12, 2021, 12:27 p.m. UTC 
Some devices are assigned globally unique MAC addresses for all
ports. These are stored by U-Boot in the second U-Boot enviroment
("sysinfo") as a range of start and end address.

Use the full range if provided.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 target/linux/realtek/base-files/etc/board.d/02_network | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index 06293174b0df..f4daeed93d86 100644
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -22,11 +22,14 @@  ucidef_set_bridge_device switch
 ucidef_set_interface_lan "$lan_list"
 
 lan_mac=""
+lan_mac_end=""
 label_mac=""
 case $board in
 *)
-	lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
-	label_mac=$lan_mac
+	lan_mac=$(mtd_get_mac_ascii u-boot-env2 mac_start)
+	lan_mac_end=$(mtd_get_mac_ascii u-boot-env2 mac_end)
+	label_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
+	[ -z "$lan_mac" ] && lan_mac=$label_mac
 	;;
 esac
 
@@ -35,7 +38,7 @@  ucidef_set_bridge_mac "$lan_mac"
 ucidef_set_network_device_mac eth0 $lan_mac
 for lan in $lan_list; do
 	ucidef_set_network_device_mac $lan $lan_mac
-	lan_mac=$(macaddr_setbit_la $lan_mac)
+	[ -z "$lan_mac_end" ] || [ "$lan_mac" == "$lan_mac_end" ] && lan_mac=$(macaddr_setbit_la $lan_mac)
 	lan_mac=$(macaddr_add $lan_mac 1)
 done
 [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac