Date: Tue, 13 Apr 2010 21:32:06 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r206569 - in head/sys/modules: . uart Message-ID: <201004132132.o3DLW66a070735@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 13 21:32:06 2010 New Revision: 206569 URL: http://svn.freebsd.org/changeset/base/206569 Log: Only compile in uart_cpu_$MACHINE.c if it exists. I'm not sure how useful it will be, but we really need to be keying off something other than MACHINE for this anyway since on arm and mips we have lots of these running around (one for each SoC family)... Modified: head/sys/modules/Makefile head/sys/modules/uart/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Tue Apr 13 20:50:59 2010 (r206568) +++ head/sys/modules/Makefile Tue Apr 13 21:32:06 2010 (r206569) @@ -280,7 +280,7 @@ SUBDIR= ${_3dfx} \ twe \ tx \ txp \ - ${_uart} \ + uart \ ubsec \ udf \ udf_iconv \ @@ -323,8 +323,6 @@ _vpo= vpo # no BUS_SPACE_UNSPECIFIED # No barrier instruction support (specific to this driver) _sym= sym -# no uart_cpu_$MACHINE_ARCH -_uart= uart # intr_disable() is a macro, causes problems _cxgb= cxgb .endif Modified: head/sys/modules/uart/Makefile ============================================================================== --- head/sys/modules/uart/Makefile Tue Apr 13 20:50:59 2010 (r206568) +++ head/sys/modules/uart/Makefile Tue Apr 13 21:32:06 2010 (r206569) @@ -16,7 +16,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} u uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c -.else +.elif exists(${CURDIR}/uart_cpu_${MACHINE}.c) SRCS+= uart_cpu_${MACHINE}.c .endif SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004132132.o3DLW66a070735>