From owner-svn-src-all@FreeBSD.ORG Sat Nov 17 04:05:47 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 19F802DF; Sat, 17 Nov 2012 04:05:47 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F15978FC14; Sat, 17 Nov 2012 04:05:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAH45kFF023443; Sat, 17 Nov 2012 04:05:46 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAH45kFt023438; Sat, 17 Nov 2012 04:05:46 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201211170405.qAH45kFt023438@svn.freebsd.org> From: Adrian Chadd Date: Sat, 17 Nov 2012 04:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243177 - in head/sys/mips: atheros 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.14 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: Sat, 17 Nov 2012 04:05:47 -0000 Author: adrian Date: Sat Nov 17 04:05:46 2012 New Revision: 243177 URL: http://svnweb.freebsd.org/changeset/base/243177 Log: Migrate the AR71xx UART (an 8250 derivative) to hide behind uart_ar71xx. The AR9330/AR9331 UART is a totally different thing, so having it included with 'uart' is not going to work out. Modified: head/sys/mips/atheros/files.ar71xx head/sys/mips/conf/AR71XX_BASE head/sys/mips/conf/AR724X_BASE head/sys/mips/conf/AR91XX_BASE head/sys/mips/conf/PB92 Modified: head/sys/mips/atheros/files.ar71xx ============================================================================== --- head/sys/mips/atheros/files.ar71xx Sat Nov 17 04:00:19 2012 (r243176) +++ head/sys/mips/atheros/files.ar71xx Sat Nov 17 04:05:46 2012 (r243177) @@ -12,8 +12,8 @@ mips/atheros/ar71xx_spi.c optional ar71x mips/atheros/pcf2123_rtc.c optional pcf2123_rtc ar71xx_spi mips/atheros/ar71xx_wdog.c optional ar71xx_wdog mips/atheros/if_arge.c optional arge -mips/atheros/uart_bus_ar71xx.c optional uart -mips/atheros/uart_cpu_ar71xx.c optional uart +mips/atheros/uart_bus_ar71xx.c optional uart_ar71xx +mips/atheros/uart_cpu_ar71xx.c optional uart_ar71xx mips/atheros/ar71xx_bus_space_reversed.c standard mips/mips/intr_machdep.c standard mips/mips/tick.c standard Modified: head/sys/mips/conf/AR71XX_BASE ============================================================================== --- head/sys/mips/conf/AR71XX_BASE Sat Nov 17 04:00:19 2012 (r243176) +++ head/sys/mips/conf/AR71XX_BASE Sat Nov 17 04:05:46 2012 (r243177) @@ -108,6 +108,7 @@ device mx25l device ar71xx_wdog device uart +device uart_ar71xx device loop device ether Modified: head/sys/mips/conf/AR724X_BASE ============================================================================== --- head/sys/mips/conf/AR724X_BASE Sat Nov 17 04:00:19 2012 (r243176) +++ head/sys/mips/conf/AR724X_BASE Sat Nov 17 04:05:46 2012 (r243177) @@ -117,6 +117,7 @@ device mx25l device ar71xx_wdog device uart +device uart_ar71xx device loop device ether Modified: head/sys/mips/conf/AR91XX_BASE ============================================================================== --- head/sys/mips/conf/AR91XX_BASE Sat Nov 17 04:00:19 2012 (r243176) +++ head/sys/mips/conf/AR91XX_BASE Sat Nov 17 04:05:46 2012 (r243177) @@ -105,6 +105,7 @@ device mx25l device ar71xx_wdog device uart +device uart_ar71xx device loop device ether Modified: head/sys/mips/conf/PB92 ============================================================================== --- head/sys/mips/conf/PB92 Sat Nov 17 04:00:19 2012 (r243176) +++ head/sys/mips/conf/PB92 Sat Nov 17 04:05:46 2012 (r243177) @@ -124,6 +124,7 @@ device ar71xx_wdog # Serial device uart +device uart_ar71xx # Network twiddling device loop