[U-Boot] [PATCH 2/2] lh7a40x: move serial driver to drivers/serial

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 cpu/lh7a40x/Makefile                               |    2 +-
 drivers/serial/Makefile                            |    1 +
 .../serial.c => drivers/serial/serial_lh7a40x.c    |    0
 include/configs/lpd7a400.h                         |    1 +
 include/configs/lpd7a404.h                         |    1 +
 5 files changed, 4 insertions(+), 1 deletions(-)
 rename cpu/lh7a40x/serial.c => drivers/serial/serial_lh7a40x.c (100%)

diff --git a/cpu/lh7a40x/Makefile b/cpu/lh7a40x/Makefile
index b9ae76e..1b3f58a 100644
--- a/cpu/lh7a40x/Makefile
+++ b/cpu/lh7a40x/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-COBJS	= cpu.o speed.o serial.o timer.o
+COBJS	= cpu.o speed.o timer.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 4a35703..ab5d565 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -39,6 +39,7 @@ COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
 COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
 COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
 COBJS-$(CONFIG_LPC2292_SERIAL) += serial_lpc2292.o
+COBJS-$(CONFIG_LH7A40X_SERIAL) += serial_lh7a40x.o
 COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
 COBJS-$(CONFIG_MX31_UART) += serial_mx31.o
 COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o
diff --git a/cpu/lh7a40x/serial.c b/drivers/serial/serial_lh7a40x.c
similarity index 100%
rename from cpu/lh7a40x/serial.c
rename to drivers/serial/serial_lh7a40x.c
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index b1bd74f..0724e53 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -43,6 +43,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_SERIAL_LH7A40X
 #define CONFIG_CONSOLE_UART2	/* UART2 LH7A40x for console */
 
 /* allow to overwrite serial and ethaddr */
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index b197674..e0ff3d7 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -43,6 +43,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_SERIAL_LH7A40X
 #define CONFIG_CONSOLE_UART2	/* UART2 LH7A40x for console */
 
 /* allow to overwrite serial and ethaddr */
-- 
1.6.2.4