[src/trunk]: src/sys/arch Adjust Allwinner emac(4) drivers to be compatible w...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0820bcc67ac1
branches:  trunk
changeset: 359549:0820bcc67ac1
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Feb 14 20:10:17 2018 +0000

description:
Adjust Allwinner emac(4) drivers to be compatible with root on NFS.

diffstat:

 sys/arch/arm/sunxi/files.sunxi |  13 ++++++++-----
 sys/arch/evbarm/conf/SUNXI     |   5 ++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 1e408c5e7bd2 -r 0820bcc67ac1 sys/arch/arm/sunxi/files.sunxi
--- a/sys/arch/arm/sunxi/files.sunxi    Wed Feb 14 19:09:09 2018 +0000
+++ b/sys/arch/arm/sunxi/files.sunxi    Wed Feb 14 20:10:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sunxi,v 1.40 2018/02/14 19:09:09 jakllsch Exp $
+#      $NetBSD: files.sunxi,v 1.41 2018/02/14 20:10:17 jakllsch Exp $
 #
 # Configuration info for Allwinner sunxi family SoCs
 #
@@ -144,14 +144,17 @@
 attach sunxirtc at fdt with sunxi_rtc
 file   arch/arm/sunxi/sunxi_rtc.c              sunxi_rtc
 
+# EMAC (common)
+device emac: arp, ether, ifnet, mii
+
 # EMAC (sun4i/sun5i/sun7i)
-device sun4iemac: arp, ether, ifnet, mii
-attach sun4iemac at fdt with sun4i_emac
+ifdef arm
+attach emac at fdt with sun4i_emac
 file   arch/arm/sunxi/sun4i_emac.c             sun4i_emac
+endif
 
 # EMAC (sun8i/sun50i)
-device sunxiemac: arp, ether, ifnet, mii
-attach sunxiemac at fdt with sunxi_emac
+attach emac at fdt with sunxi_emac
 file   arch/arm/sunxi/sunxi_emac.c             sunxi_emac
 
 # GMAC
diff -r 1e408c5e7bd2 -r 0820bcc67ac1 sys/arch/evbarm/conf/SUNXI
--- a/sys/arch/evbarm/conf/SUNXI        Wed Feb 14 19:09:09 2018 +0000
+++ b/sys/arch/evbarm/conf/SUNXI        Wed Feb 14 20:10:17 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: SUNXI,v 1.58 2018/01/31 16:24:11 jakllsch Exp $
+#      $NetBSD: SUNXI,v 1.59 2018/02/14 20:10:17 jakllsch Exp $
 #
 #      Allwinner sunxi family
 #
@@ -214,8 +214,7 @@
 gpio*          at gpiobus?
 
 # Ethernet
-sun4iemac*     at fdt?                 # Allwinner Fast Ethernet (EMAC)
-sunxiemac*     at fdt?                 # Allwinner Gigabit Ethernet (EMAC)
+emac*          at fdt?         # Allwinner Fast or Gigabit Ethernet (EMAC)
 awge*          at fdt?                 # Allwinner Gigabit Ethernet (GMAC)
 rgephy*                at mii? phy ?
 rlphy*         at mii? phy ?