U-Boot v2024.10 correctly derives builtin Ethernet's MAC from rk3308 …

…unique CPUid So, disable the userspace derivation of MAC from the CPUid for end0 by default
armbian · Nov 25, 2024 · 341b9d3 · 341b9d3
1 parent e6ab9f0
commit 341b9d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/bsp/radxa3308/etc/udev/rules.d/05-rockpis-MACaddress.rules b/packages/bsp/radxa3308/etc/udev/rules.d/05-rockpis-MACaddress.rules
@@ -5,9 +5,10 @@
 #All the two digit hex code prefixes passed to fixEtherAddr should be unique
 #and chosen such that (n-2)%4 == 0
 
-#Otherwise, the RockPI-S built-in ethernet MAC is derived from rootfs image
-KERNEL=="end0", ACTION=="add" RUN+="fixEtherAddr %k 06"
-
 #Otherwise, the RockPI-S wifi chip MACs will be different on each boot
 KERNEL=="wlan0", ACTION=="add" RUN+="fixEtherAddr %k 0a"
 KERNEL=="p2p0", ACTION=="add" RUN+="fixEtherAddr %k 0e"
+
+#v2024.10 u-boot derives built-in ethernet MAC for RockPI-S from the CPUid
+#so, the fix for interface end0 should no longer be needed
+#KERNEL=="end0", ACTION=="add" RUN+="fixEtherAddr %k 06"
diff --git a/packages/bsp/radxa3308/etc/udev/rules.d/05-rocks0-MACaddress.rules b/packages/bsp/radxa3308/etc/udev/rules.d/05-rocks0-MACaddress.rules
@@ -5,5 +5,6 @@
 #All the two digit hex code prefixes passed to fixEtherAddr should be unique
 #and chosen such that (n-2)%4 == 0
 
-#Otherwise, the RockS0's built-in ethernet MAC is derived from rootfs image
-KERNEL=="end0", ACTION=="add" RUN+="fixEtherAddr %k 06"
+#In v2024.10 u-boot, RockS0's built-in ethernet MAC is derived from the CPUid
+#so, the fix for interface end0 should no longer be needed
+#KERNEL=="end0", ACTION=="add" RUN+="fixEtherAddr %k 06"