diff --git a/cpu/lh7a40x/Makefile b/cpu/lh7a40x/Makefile
index b9ae76effaccb25a272e004496c0caa9222cdecc..1b3f58abb93bd50e85ce42b122d23fac0a2250ca 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 4a35703d222805c742bf86d78b4d2fff38df3cdf..ab5d5654d62a736641604e0297862d3aa7947a43 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 b1bd74fc6fb73a6904234cbab9cbc98167460e1f..bf4a57d249bd06ce4d2a65860de04445977d3bd4 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -43,6 +43,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_LH7A40X_SERIAL
 #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 b197674d47aeb91abd066a81756e7740f92e8704..102c0af3b9fe3650eb613547cabd692621535b94 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -43,6 +43,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_LH7A40X_SERIAL
 #define CONFIG_CONSOLE_UART2	/* UART2 LH7A40x for console */
 
 /* allow to overwrite serial and ethaddr */