Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- drivers/Makefile | 9 --------- drivers/serial/Makefile | 10 ++++++++++ drivers/{ => serial}/atmel_usart.c | 0 drivers/{ => serial}/atmel_usart.h | 0 drivers/{ => serial}/ns16550.c | 0 drivers/{ => serial}/ns9750_serial.c | 0 drivers/{ => serial}/s3c4510b_uart.c | 0 drivers/{ => serial}/s3c4510b_uart.h | 0 drivers/{ => serial}/serial.c | 0 drivers/{ => serial}/serial_max3100.c | 0 drivers/{ => serial}/serial_pl010.c | 0 drivers/{ => serial}/serial_pl011.c | 0 drivers/{ => serial}/serial_pl011.h | 0 drivers/{ => serial}/serial_xuartlite.c | 0 drivers/{ => serial}/usbtty.c | 0 drivers/{ => serial}/usbtty.h | 0 16 files changed, 10 insertions(+), 9 deletions(-) rename drivers/{ => serial}/atmel_usart.c (100%) rename drivers/{ => serial}/atmel_usart.h (100%) rename drivers/{ => serial}/ns16550.c (100%) rename drivers/{ => serial}/ns9750_serial.c (100%) rename drivers/{ => serial}/s3c4510b_uart.c (100%) rename drivers/{ => serial}/s3c4510b_uart.h (100%) rename drivers/{ => serial}/serial.c (100%) rename drivers/{ => serial}/serial_max3100.c (100%) rename drivers/{ => serial}/serial_pl010.c (100%) rename drivers/{ => serial}/serial_pl011.c (100%) rename drivers/{ => serial}/serial_pl011.h (100%) rename drivers/{ => serial}/serial_xuartlite.c (100%) rename drivers/{ => serial}/usbtty.c (100%) rename drivers/{ => serial}/usbtty.h (100%)
diff --git a/drivers/Makefile b/drivers/Makefile index fe9c5f1..5386313 100755 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -30,16 +30,7 @@ LIB = $(obj)libdrivers.a # # Console Drivers # -COBJS-y += atmel_usart.o COBJS-y += netconsole.o -COBJS-y += ns16550.o -COBJS-y += s3c4510b_uart.o -COBJS-y += serial.o -COBJS-y += serial_max3100.o -COBJS-y += serial_pl010.o -COBJS-y += serial_pl011.o -COBJS-y += serial_xuartlite.o -COBJS-y += usbtty.o
# # Network Drivers diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index fe3ade3..6138064 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,7 +25,17 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libserial.a
+COBJS-y += atmel_usart.o COBJS-y += mcfuart.o +COBJS-y += ns16550.o +COBJS-y += ns9750_serial.o +COBJS-y += s3c4510b_uart.o +COBJS-y += serial.o +COBJS-y += serial_max3100.o +COBJS-y += serial_pl010.o +COBJS-y += serial_pl011.o +COBJS-y += serial_xuartlite.o +COBJS-y += usbtty.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/atmel_usart.c b/drivers/serial/atmel_usart.c similarity index 100% rename from drivers/atmel_usart.c rename to drivers/serial/atmel_usart.c diff --git a/drivers/atmel_usart.h b/drivers/serial/atmel_usart.h similarity index 100% rename from drivers/atmel_usart.h rename to drivers/serial/atmel_usart.h diff --git a/drivers/ns16550.c b/drivers/serial/ns16550.c similarity index 100% rename from drivers/ns16550.c rename to drivers/serial/ns16550.c diff --git a/drivers/ns9750_serial.c b/drivers/serial/ns9750_serial.c similarity index 100% rename from drivers/ns9750_serial.c rename to drivers/serial/ns9750_serial.c diff --git a/drivers/s3c4510b_uart.c b/drivers/serial/s3c4510b_uart.c similarity index 100% rename from drivers/s3c4510b_uart.c rename to drivers/serial/s3c4510b_uart.c diff --git a/drivers/s3c4510b_uart.h b/drivers/serial/s3c4510b_uart.h similarity index 100% rename from drivers/s3c4510b_uart.h rename to drivers/serial/s3c4510b_uart.h diff --git a/drivers/serial.c b/drivers/serial/serial.c similarity index 100% rename from drivers/serial.c rename to drivers/serial/serial.c diff --git a/drivers/serial_max3100.c b/drivers/serial/serial_max3100.c similarity index 100% rename from drivers/serial_max3100.c rename to drivers/serial/serial_max3100.c diff --git a/drivers/serial_pl010.c b/drivers/serial/serial_pl010.c similarity index 100% rename from drivers/serial_pl010.c rename to drivers/serial/serial_pl010.c diff --git a/drivers/serial_pl011.c b/drivers/serial/serial_pl011.c similarity index 100% rename from drivers/serial_pl011.c rename to drivers/serial/serial_pl011.c diff --git a/drivers/serial_pl011.h b/drivers/serial/serial_pl011.h similarity index 100% rename from drivers/serial_pl011.h rename to drivers/serial/serial_pl011.h diff --git a/drivers/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c similarity index 100% rename from drivers/serial_xuartlite.c rename to drivers/serial/serial_xuartlite.c diff --git a/drivers/usbtty.c b/drivers/serial/usbtty.c similarity index 100% rename from drivers/usbtty.c rename to drivers/serial/usbtty.c diff --git a/drivers/usbtty.h b/drivers/serial/usbtty.h similarity index 100% rename from drivers/usbtty.h rename to drivers/serial/usbtty.h