From owner-svn-src-all@freebsd.org Sun Oct 4 22:50:39 2015 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 1FD15A10E62; Sun, 4 Oct 2015 22:50:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 EC468124E; Sun, 4 Oct 2015 22:50:38 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t94MockY063210; Sun, 4 Oct 2015 22:50:38 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t94Mocjq063208; Sun, 4 Oct 2015 22:50:38 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201510042250.t94Mocjq063208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Sun, 4 Oct 2015 22:50:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288672 - head/sys/mips/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.20 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: Sun, 04 Oct 2015 22:50:39 -0000 Author: sbruno Date: Sun Oct 4 22:50:37 2015 New Revision: 288672 URL: https://svnweb.freebsd.org/changeset/base/288672 Log: Set correct argemdio addr, comment out arge1 as its not physically connected to anything. Move a couple of devices out of the kernel and into modules. Modified: head/sys/mips/conf/WZR-300HP head/sys/mips/conf/WZR-300HP.hints Modified: head/sys/mips/conf/WZR-300HP ============================================================================== --- head/sys/mips/conf/WZR-300HP Sun Oct 4 21:16:45 2015 (r288671) +++ head/sys/mips/conf/WZR-300HP Sun Oct 4 22:50:37 2015 (r288672) @@ -28,9 +28,6 @@ device geom_uncompress # compressed in- options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" -# options MD_ROOT -# options MD_ROOT_SIZE="6144" - options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash options ATH_EEPROM_FIRMWARE # Use EEPROM from flash device firmware # Used by the above @@ -42,10 +39,11 @@ device miiproxy device etherswitch device arswitch -# Enable GPIO -device gpio -device gpioled - # hwpmc device hwpmc_mips24k device hwpmc + +# load these via modules, shrink kernel +nodevice if_bridge +nodevice bridgestp +nodevice random Modified: head/sys/mips/conf/WZR-300HP.hints ============================================================================== --- head/sys/mips/conf/WZR-300HP.hints Sun Oct 4 21:16:45 2015 (r288671) +++ head/sys/mips/conf/WZR-300HP.hints Sun Oct 4 22:50:37 2015 (r288672) @@ -5,11 +5,11 @@ # arge1 MDIO bus hint.argemdio.0.at="nexus0" -hint.argemdio.0.maddr=0x1a000000 +hint.argemdio.0.maddr=0x19000000 hint.argemdio.0.msize=0x1000 hint.argemdio.0.order=0 -hint.arge.0.phymask=0x0 +hint.arge.0.phymask=0x1 hint.arge.0.media=1000 hint.arge.0.fduplex=1 hint.arge.0.eeprommac=0x1f05120c @@ -17,9 +17,9 @@ hint.arge.0.mdio=mdioproxy1 # .. off # arge1: nail to 1000/full, RMII - connected to the switch -hint.arge.1.media=1000 # Map to 1000/full -hint.arge.1.fduplex=1 # -hint.arge.1.phymask=0x0 # no directly mapped PHYs +#hint.arge.1.media=1000 # Map to 1000/full +#hint.arge.1.fduplex=1 # +#hint.arge.1.phymask=0x0 # no directly mapped PHYs # # AR7240 switch config @@ -28,7 +28,7 @@ hint.arswitch.0.at="mdio0" hint.arswitch.0.is_7240=1 # We need to be explicitly told this hint.arswitch.0.numphys=4 # 4 active switch PHYs (PHY 0 -> 3) hint.arswitch.0.phy4cpu=1 # Yes, PHY 4 == dedicated PHY -hint.arswitch.0.is_rgmii=0 # No, not RGMII +hint.arswitch.0.is_rgmii=1 # No, not RGMII hint.arswitch.0.is_gmii=0 # No, not GMII # ath0 - slot 0