svn commit: r249765 - in head/sys: dev/uart modules/uart

Takahashi Yoshihiro nyan at FreeBSD.org
Mon Apr 22 13:02:42 UTC 2013


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
 


More information about the svn-src-head mailing list