rockchip: use generate_mac_from_mmc_cid for emmc target

This commit is contained in:
coolsnowwolf 2023-05-22 11:52:50 +08:00
parent 7e397cd22f
commit 45a15113ad

View File

@ -46,6 +46,13 @@ rockchip_setup_interfaces()
esac 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() nanopi_r4s_get_mac()
{ {
local interface=$1 local interface=$1
@ -58,7 +65,7 @@ nanopi_r4s_get_mac()
address=$(macaddr_setbit_la "$address") address=$(macaddr_setbit_la "$address")
fi fi
else else
address=$(macaddr_generate_from_mmc_cid mmcblk1) address=$(generate_mac_from_mmc_cid)
if [ "$interface" = "lan" ]; then if [ "$interface" = "lan" ]; then
address=$(macaddr_add "$address" 1) address=$(macaddr_add "$address" 1)
fi fi
@ -92,7 +99,7 @@ rockchip_setup_macs()
sharevdi,h3399pc|\ sharevdi,h3399pc|\
sharevdi,guangmiao-g4c|\ sharevdi,guangmiao-g4c|\
rocktech,mpc1903) rocktech,mpc1903)
wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0) wan_mac=$(generate_mac_from_mmc_cid)
lan_mac=$(macaddr_add "$wan_mac" +1) lan_mac=$(macaddr_add "$wan_mac" +1)
;; ;;
friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4s|\