From owner-svn-src-head@FreeBSD.ORG Mon Apr 22 13:02:42 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F3F19987; Mon, 22 Apr 2013 13:02:41 +0000 (UTC) (envelope-from nyan@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 E4BF01931; Mon, 22 Apr 2013 13:02:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MD2fX4049016; Mon, 22 Apr 2013 13:02:41 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MD2fad049013; Mon, 22 Apr 2013 13:02:41 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <201304221302.r3MD2fad049013@svn.freebsd.org> From: Takahashi Yoshihiro Date: Mon, 22 Apr 2013 13:02:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249765 - in head/sys: dev/uart modules/uart X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 13:02:42 -0000 Author: nyan Date: Mon Apr 22 13:02:41 2013 New Revision: 249765 URL: http://svnweb.freebsd.org/changeset/base/249765 Log: Build uart_dev_lpc.c on arm only. This fixes pc98 build. Modified: head/sys/dev/uart/uart_subr.c head/sys/modules/uart/Makefile Modified: head/sys/dev/uart/uart_subr.c ============================================================================== --- head/sys/dev/uart/uart_subr.c Mon Apr 22 09:18:50 2013 (r249764) +++ head/sys/dev/uart/uart_subr.c Mon Apr 22 13:02:41 2013 (r249765) @@ -52,7 +52,9 @@ static struct uart_class *uart_classes[] &uart_ns8250_class, &uart_sab82532_class, &uart_z8530_class, +#if defined(__arm__) &uart_lpc_class, +#endif }; static size_t uart_nclasses = sizeof(uart_classes) / sizeof(uart_classes[0]); Modified: head/sys/modules/uart/Makefile ============================================================================== --- head/sys/modules/uart/Makefile Mon Apr 22 09:18:50 2013 (r249764) +++ head/sys/modules/uart/Makefile Mon Apr 22 13:02:41 2013 (r249765) @@ -6,6 +6,10 @@ uart_bus_ebus= uart_bus_ebus.c .endif +.if ${MACHINE_CPUARCH} == "arm" +uart_dev_lpc= uart_dev_lpc.c +.endif + .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "sparc64" ofw_bus_if= ofw_bus_if.h .endif @@ -23,7 +27,7 @@ KMOD= uart SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c ${uart_cpu_machine} uart_dbg.c \ - uart_dev_lpc.c uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \ + ${uart_dev_lpc} uart_dev_ns8250.c uart_dev_quicc.c uart_dev_sab82532.c \ uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c