Module Name: src
Committed By: jakllsch
Date: Wed Feb 14 20:10:17 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: files.sunxi
src/sys/arch/evbarm/conf: SUNXI
Log Message:
Adjust Allwinner emac(4) drivers to be compatible with root on NFS.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/SUNXI
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.40 src/sys/arch/arm/sunxi/files.sunxi:1.41
--- src/sys/arch/arm/sunxi/files.sunxi:1.40 Wed Feb 14 19:09:09 2018
+++ src/sys/arch/arm/sunxi/files.sunxi Wed Feb 14 20:10:17 2018
@@ -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 @@ device sunxirtc
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
Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.58 src/sys/arch/evbarm/conf/SUNXI:1.59
--- src/sys/arch/evbarm/conf/SUNXI:1.58 Wed Jan 31 16:24:11 2018
+++ src/sys/arch/evbarm/conf/SUNXI Wed Feb 14 20:10:17 2018
@@ -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 @@ sunxigpio* at fdt? pass 3 # GPIO
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 ?
