From owner-svn-src-all@freebsd.org Mon Nov 14 20:57:32 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31289C410F4; Mon, 14 Nov 2016 20:57:32 +0000 (UTC) (envelope-from loos@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3CA3E13; Mon, 14 Nov 2016 20:57:31 +0000 (UTC) (envelope-from loos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAEKvVqx081166; Mon, 14 Nov 2016 20:57:31 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAEKvVkZ081165; Mon, 14 Nov 2016 20:57:31 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201611142057.uAEKvVkZ081165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Mon, 14 Nov 2016 20:57:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308651 - head/sys/arm/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Nov 2016 20:57:32 -0000 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