svn commit: r308651 - head/sys/arm/conf

[Luiz Otavio O Souza]

Author: loos
Date: Mon Nov 14 20:57:30 2016
New Revision: 308651
URL: https://svnweb.freebsd.org/changeset/base/308651

Log:
  Add the cpsw, the NIC driver for ti/am335x, to GENERIC kernel.
  
  While here:
  
   - remove 'device mii' - included by miibus;
   - remove 'device smcphy' - included by miibus;
   - sorted the network drivers list;
   - added a comment about miibus based on amd64/GENERIC.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/sys/arm/conf/GENERIC

Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC	Mon Nov 14 20:37:07 2016	(r308650)
+++ head/sys/arm/conf/GENERIC	Mon Nov 14 20:57:30 2016	(r308651)
@@ -182,18 +182,18 @@ device		usfs
 device		loop
 device		ether
 device		vlan			# 802.1Q VLAN support
-device		mii
 device		bpf
 
-device		emac			# 10/100 integrated EMAC controller
-device		dwc			# 10/100/1000 integrated GMAC controller
-device		awg			# 10/100/1000 integrated EMAC controller
-
-# USB ethernet support, requires miibus
-device		smcphy
-device		smsc
+# Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus
 
+device		awg			# 10/100/1000 integrated EMAC controller
+device		cpsw			# TI Common Platform Ethernet Switch (CPSW)
+device		dwc			# 10/100/1000 integrated GMAC controller
+device		emac			# 10/100 integrated EMAC controller
+device		smsc			# SMSC LAN91C111
+
 # Sound support
 device		sound