Skip to contentSkip to conversation

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

PATCH New Mike Frysinger 2 participants 2 messages Feb 12, 2009 – Feb 21, 2009

lore
Share & tools
lore
#0 lore raw

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

---
v2
- rebased against master

 drivers/serial/Makefile  |    4 ++--
 drivers/serial/ns16550.c |    5 -----
 drivers/serial/serial.c  |    4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)
drivers/serial/Makefile +2 -2
index b6fd0d7..0f980ab 100644
@@ -28,10 +28,10 @@ LIB	:= $(obj)libserial.a
 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
drivers/serial/ns16550.c +0 -5
index 93c2243..a9391c7 100644
@@ -5,9 +5,6 @@
  */
 
 #include <config.h>
-
-#ifdef CONFIG_SYS_NS16550
-
 #include <ns16550.h>
 
 #define LCRVAL LCR_8N1					/* 8 data, 1 stop, no parity */
@@ -75,5 +72,3 @@ int NS16550_tstc (NS16550_t com_port)
 {
 	return ((com_port->lsr & LSR_DR) != 0);
 }
-
-#endif
drivers/serial/serial.c +0 -4
index bce7548..966df9a 100644
@@ -23,8 +23,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_SYS_NS16550_SERIAL
-
 #include <ns16550.h>
 #ifdef CONFIG_NS87308
 #include <ns87308.h>
@@ -328,5 +326,3 @@ DECLARE_ESERIAL_FUNCTIONS(4);
 struct serial_device eserial4_device =
 	INIT_ESERIAL_STRUCTURE(4,"eserial3","EUART4");
 #endif /* CONFIG_SERIAL_MULTI */
-
-#endif
Signature · 1 line
1.6.1.2
#1 lore raw

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

Dear Mike Frysinger,

Quoted 9 lines · In message <[email protected]> you wrote:

---
v2
- rebased against master

 drivers/serial/Makefile  |    4 ++--
 drivers/serial/ns16550.c |    5 -----
 drivers/serial/serial.c  |    4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)

Applied (needed fixing - please check). thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Stupidity, like virtue, is its own reward"     - William E. Davidsen