diff options
| author | Jan-Niklas Burfeind <git@aiyionpri.me> | 2022-12-23 22:03:14 +0100 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2022-12-25 02:27:55 +0100 |
| commit | c7d3bbb909bdcccd4f26f18b18cc1cb00500a874 (patch) | |
| tree | af9de04cf6c5b065d15ce34f0983b8f4666b7a7b /target/linux/rockchip | |
| parent | 59254010077c9086afee8a8b4c490943d6749065 (diff) | |
| download | upstream-c7d3bbb909bdcccd4f26f18b18cc1cb00500a874.tar.gz upstream-c7d3bbb909bdcccd4f26f18b18cc1cb00500a874.tar.bz2 upstream-c7d3bbb909bdcccd4f26f18b18cc1cb00500a874.zip | |
sunxi: ensure NanoPi R1 has unique MAC address
Ensure the MAC address for all NanoPi R1 boards is assigned uniquely for
each board.
The vendor ships the device in two variants; one with and one without
eMMC; but both without static mac-addresses.
In order to assign both board types unique MAC addresses, fall back on
the same method used for the NanoPi R2S and R4S in case the EEPROM
chip is not present by generating the board MAC from the SD card CID.
[0] https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R1#Hardware_Spec
Similar too and based on:
commit b5675f500daf ("rockchip: ensure NanoPi R4S has unique MAC address")
Co-authored-by: David Bauer <mail@david-bauer.net>
Signed-off-by: Jan-Niklas Burfeind <git@aiyionpri.me>
Diffstat (limited to 'target/linux/rockchip')
| -rw-r--r-- | target/linux/rockchip/armv8/base-files/etc/board.d/02_network | 13 |
1 files changed, 2 insertions, 11 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 b0e6479947..816045a480 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -17,15 +17,6 @@ rockchip_setup_interfaces() esac } -generate_mac_from_mmc_cid() -{ - local mmc_dev=$1 - - local sd_hash=$(sha256sum /sys/class/block/$mmc_dev/device/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}")")" -} - nanopi_r4s_get_mac() { local interface=$1 @@ -38,7 +29,7 @@ nanopi_r4s_get_mac() address=$(macaddr_setbit_la "$address") fi else - address=$(generate_mac_from_mmc_cid mmcblk1) + address=$(macaddr_generate_from_mmc_cid mmcblk1) if [ "$interface" = "lan" ]; then address=$(macaddr_add "$address" 1) fi @@ -56,7 +47,7 @@ rockchip_setup_macs() case "$board" in friendlyarm,nanopi-r2s) - wan_mac=$(generate_mac_from_mmc_cid mmcblk0) + wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0) lan_mac=$(macaddr_add "$wan_mac" 1) ;; friendlyarm,nanopi-r4s) |