From 6bf0fbd526ce397d07b498a5a823a0a6c303e266 Mon Sep 17 00:00:00 2001 From: lean Date: Thu, 1 Sep 2022 14:55:14 +0800 Subject: [PATCH] rockchip:fix nanopi-r4s mac address again --- .../rockchip/armv8/base-files/etc/board.d/02_network | 8 ++++++-- ...rm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 7 +------ ...rm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 7 +------ ...rm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 7 +------ 4 files changed, 9 insertions(+), 20 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 d3de702f0..9e15e53f3 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 @@ -38,7 +38,7 @@ rockchip_setup_interfaces() nanopi_r2s_generate_mac() { - local sd_hash=$(sha256sum /sys/class/block/mmcblk0/device/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}")")" } @@ -64,7 +64,11 @@ rockchip_setup_macs() ;; friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4se) - wan_mac=$(get_mac_binary "/sys/bus/i2c/devices/2-0051/eeprom" 0xfa) + if [ -f /sys/bus/i2c/devices/2-0051/eeprom ]; then + wan_mac=$(get_mac_binary "/sys/bus/i2c/devices/2-0051/eeprom" 0xfa) + else + wan_mac=$(nanopi_r2s_generate_mac) + fi lan_mac=$(macaddr_setbit_la "$wan_mac") ;; xunlong,orangepi-r1-plus|\ diff --git a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..3ead34ca9 100644 --- a/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -68,6 +68,24 @@ +@@ -75,6 +75,19 @@ &emmc_phy { status = "disabled"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02"; diff --git a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..3ead34ca9 100644 --- a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -68,6 +68,24 @@ +@@ -75,6 +75,19 @@ &emmc_phy { status = "disabled"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02"; diff --git a/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index cd6640f94..3ead34ca9 100644 --- a/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -68,6 +68,24 @@ +@@ -75,6 +75,19 @@ &emmc_phy { status = "disabled"; }; -+&gmac { -+ nvmem-cells = <&mac_address>; -+ nvmem-cell-names = "mac-address"; -+}; -+ +&i2c2 { + eeprom@51 { + compatible = "microchip,24c02", "atmel,24c02";