From 6401fca74dc9f4f1eb7df90b287e0061672b9f00 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 7 Mar 2021 15:42:47 +0800 Subject: [PATCH] rockchip: use native mac address for NanoPi R4S Signed-off-by: Tianling Shen --- .../rockchip/armv8/base-files/etc/board.d/02_network | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network index d8acaabe27..4849b877e1 100755 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -18,9 +18,9 @@ rockchip_setup_interfaces() esac } -nanopi_generate_mac() +nanopi_r2s_generate_mac() { - local sd_hash=$(sha256sum /sys/devices/platform/*.dwmmc/mmc_host/mmc0/mmc0:*/cid) + local sd_hash=$(sha256sum /sys/devices/platform/ff500000.dwmmc/mmc_host/mmc0/mmc0:*/cid) local mac_base=$(macaddr_canonicalize "$(echo "${sd_hash}" | dd bs=1 count=12 2>/dev/null)") echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")" } @@ -33,9 +33,12 @@ rockchip_setup_macs() local label_mac="" case "$board" in - friendlyarm,nanopi-r2s|\ + friendlyarm,nanopi-r2s) + wan_mac=$(nanopi_r2s_generate_mac) + lan_mac=$(macaddr_add "$wan_mac" +1) + ;; friendlyarm,nanopi-r4s) - wan_mac=$(nanopi_generate_mac) + wan_mac=$(cat /sys/class/net/eth0/address) lan_mac=$(macaddr_add "$wan_mac" +1) ;; esac