drivers/serial/ns16550: move ifdef into Makefile COBJS-$(...)

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

drivers/serial/ns16550: move ifdef into Makefile COBJS-$(...)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger · Wolfgang Denk
1 parent 6bcb4b806c
Showing 3 changed files with 3 additions and 11 deletions Side-by-side Diff
drivers/serial/Makefile
drivers/serial/ns16550.c
drivers/serial/serial.c
@@ -28,10 +28,10 @@
 COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
 COBJS-$(CONFIG_MCFUART) += mcfuart.o
 COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
-COBJS-y += ns16550.o
+COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
-COBJS-y += serial.o
+COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
 COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
 COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
@@ -5,9 +5,6 @@
  */
  
 #include <config.h>
-
-#ifdef CONFIG_SYS_NS16550
-
 #include <ns16550.h>
  
 #define LCRVAL LCR_8N1					/* 8 data, 1 stop, no parity */
@@ -36,7 +33,7 @@
 #else
 	com_port->mdr1 = 0;	/* /16 is proper to hit 115200 with 48MHz */
 #endif
-#endif
+#endif /* CONFIG_OMAP */
 }
  
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
@@ -80,5 +77,4 @@
 }
  
 #endif /* CONFIG_NS16550_MIN_FUNCTIONS */
-#endif
@@ -23,8 +23,6 @@
  
 #include <common.h>
  
-#ifdef CONFIG_SYS_NS16550_SERIAL
-
 #include <ns16550.h>
 #ifdef CONFIG_NS87308
 #include <ns87308.h>
@@ -328,6 +326,4 @@
 struct serial_device eserial4_device =
 	INIT_ESERIAL_STRUCTURE(4,"eserial3","EUART4");
 #endif /* CONFIG_SERIAL_MULTI */
-
-#endif
...	...	@@ -28,10 +28,10 @@
28	28	COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
29	29	COBJS-$(CONFIG_MCFUART) += mcfuart.o
30	30	COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
31		-COBJS-y += ns16550.o
	31	+COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
32	32	COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
33	33	COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
34		-COBJS-y += serial.o
	34	+COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
35	35	COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
36	36	COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
37	37	COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
...	...	@@ -5,9 +5,6 @@
5	5	*/
6	6
7	7	#include <config.h>
8		-
9		-#ifdef CONFIG_SYS_NS16550
10		-
11	8	#include <ns16550.h>
12	9
13	10	#define LCRVAL LCR_8N1 /* 8 data, 1 stop, no parity */
...	...	@@ -36,7 +33,7 @@
36	33	#else
37	34	com_port->mdr1 = 0; /* /16 is proper to hit 115200 with 48MHz */
38	35	#endif
39		-#endif
	36	+#endif /* CONFIG_OMAP */
40	37	}
41	38
42	39	#ifndef CONFIG_NS16550_MIN_FUNCTIONS
...	...	@@ -80,5 +77,4 @@
80	77	}
81	78
82	79	#endif /* CONFIG_NS16550_MIN_FUNCTIONS */
83		-#endif
...	...	@@ -23,8 +23,6 @@
23	23
24	24	#include <common.h>
25	25
26		-#ifdef CONFIG_SYS_NS16550_SERIAL
27		-
28	26	#include <ns16550.h>
29	27	#ifdef CONFIG_NS87308
30	28	#include <ns87308.h>
...	...	@@ -328,6 +326,4 @@
328	326	struct serial_device eserial4_device =
329	327	INIT_ESERIAL_STRUCTURE(4,"eserial3","EUART4");
330	328	#endif /* CONFIG_SERIAL_MULTI */
331		-
332		-#endif