Browse Source

ipq806x: move ASRock G10 fix mac preinit script to generic board.d script

Drop and move ASRock G10 preinit script to fix mac address to generic
board.d script and rework for consistency with other devices following a
similar implementation.

Signed-off-by: Christian Marangi <[email protected]>
Christian Marangi 2 years ago
parent
commit
f166c9e617

+ 6 - 0
target/linux/ipq806x/base-files/etc/board.d/02_network

@@ -83,6 +83,12 @@ ipq806x_setup_macs()
 			ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"
 			ucidef_set_interface_macaddr "wan" "$(macaddr_add $hw_mac_addr 3)"
 		;;
+		asrock,g10)
+			hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
+			ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
+			hw_mac_addr=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
+			ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
+		;;
 	esac
 }
 

+ 0 - 14
target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh

@@ -1,14 +0,0 @@
-. /lib/functions.sh
-
-preinit_set_mac_address() {
-	case $(board_name) in
-	asrock,g10)
-		lan_mac=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
-		wan_mac=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
-		ip link set dev eth0 address "${lan_mac}"
-		ip link set dev eth1 address "${wan_mac}"
-		;;
-	esac
-}
-
-boot_hook_add preinit_main preinit_set_mac_address