From 45a15113ad6146b736574f9d008e8a0961a176f5 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 22 May 2023 11:52:50 +0800 Subject: [PATCH] rockchip: use generate_mac_from_mmc_cid for emmc target --- .../rockchip/armv8/base-files/etc/board.d/02_network | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 f383c2da1..17ce0ac3b 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 @@ -46,6 +46,13 @@ rockchip_setup_interfaces() esac } +generate_mac_from_mmc_cid() +{ + local sd_hash=$(sha256sum /sys/class/block/mmcblk*/device/cid | head -n 1) + 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}")")" +} + nanopi_r4s_get_mac() { local interface=$1 @@ -58,7 +65,7 @@ nanopi_r4s_get_mac() address=$(macaddr_setbit_la "$address") fi else - address=$(macaddr_generate_from_mmc_cid mmcblk1) + address=$(generate_mac_from_mmc_cid) if [ "$interface" = "lan" ]; then address=$(macaddr_add "$address" 1) fi @@ -92,7 +99,7 @@ rockchip_setup_macs() sharevdi,h3399pc|\ sharevdi,guangmiao-g4c|\ rocktech,mpc1903) - wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0) + wan_mac=$(generate_mac_from_mmc_cid) lan_mac=$(macaddr_add "$wan_mac" +1) ;; friendlyarm,nanopi-r4s|\