summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-31 12:44:27 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:53 +0200
commit3ea201b016ab259a5ac8824af767569522768c47 (patch)
tree5684f470ebba4b1e82aa9ef75b22019ad64e6a43
parent379be585eb2343d8814a5cee5fb3da930d846bee (diff)
downloadu-boot-imx-3ea201b016ab259a5ac8824af767569522768c47.zip
u-boot-imx-3ea201b016ab259a5ac8824af767569522768c47.tar.gz
u-boot-imx-3ea201b016ab259a5ac8824af767569522768c47.tar.bz2
lh7a40x: move serial driver to drivers/serial
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/lh7a40x/Makefile2
-rw-r--r--drivers/serial/Makefile1
-rw-r--r--drivers/serial/serial_lh7a40x.c (renamed from cpu/lh7a40x/serial.c)0
-rw-r--r--include/configs/lpd7a400.h1
-rw-r--r--include/configs/lpd7a404.h1
5 files changed, 4 insertions, 1 deletions
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
index 4767489..4767489 100644
--- a/cpu/lh7a40x/serial.c
+++ b/drivers/serial/serial_lh7a40x.c
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index b1bd74f..bf4a57d 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 b197674..102c0af 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 */