298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

rockchip:fix nanopi-r4s mac address again

Browse Source
This commit is contained in:
lean 2022-09-01 14:55:14 +08:00
parent 3226f7cfab
commit 6bf0fbd526
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/rockchip/armv8/base-files/etc/board.d/02_network
View File

@ -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)
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|\

7
target/linux/rockchip/patches-5.10/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- 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";

7
target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- 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";

7
target/linux/rockchip/patches-5.4/010-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch
View File

@ -13,15 +13,10 @@ Signed-off-by: Tianling Shen <cnsztl@gmail.com>
--- 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";