summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-03-29 23:01:41 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-03-29 23:01:41 +0200
commit412ab705888742add435dd6ffc2e8bda14962235 (patch)
tree45848ea38bd1347da153c5facdb979fdc906006f
parentb2368754a9202225fd072e159fb78da7d2cdb623 (diff)
downloadu-boot-imx-412ab705888742add435dd6ffc2e8bda14962235.zip
u-boot-imx-412ab705888742add435dd6ffc2e8bda14962235.tar.gz
u-boot-imx-412ab705888742add435dd6ffc2e8bda14962235.tar.bz2
sa1100: move serial driver to drivers/serial
add CONFIG_SA1100_SERIAL to activate the driver Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--cpu/sa1100/Makefile2
-rw-r--r--drivers/serial/Makefile1
-rw-r--r--drivers/serial/serial_sa1100.c (renamed from cpu/sa1100/serial.c)0
-rw-r--r--include/configs/assabet.h1
-rw-r--r--include/configs/dnp1110.h1
-rw-r--r--include/configs/gcplus.h1
-rw-r--r--include/configs/lart.h1
-rw-r--r--include/configs/shannon.h1
8 files changed, 7 insertions, 1 deletions
diff --git a/cpu/sa1100/Makefile b/cpu/sa1100/Makefile
index 790faeb..fd696f7 100644
--- a/cpu/sa1100/Makefile
+++ b/cpu/sa1100/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o
-COBJS = serial.o interrupts.o cpu.o
+COBJS = interrupts.o cpu.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 37cc5a0..8cac794 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -37,6 +37,7 @@ COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
+COBJS-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o
COBJS-$(CONFIG_S3C44B0_SERIAL) += serial_s3c44b0.o
COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
diff --git a/cpu/sa1100/serial.c b/drivers/serial/serial_sa1100.c
index 5d18875..5d18875 100644
--- a/cpu/sa1100/serial.c
+++ b/drivers/serial/serial_sa1100.c
diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 4da68b3..a6c442b 100644
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -57,6 +57,7 @@
/*
* select serial console configuration
*/
+#define CONFIG_SA1100_SERIAL
#define CONFIG_SERIAL1 1 /* we use SERIAL 1 on Intel Assabet */
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 3f658a7..8f615bd 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -59,6 +59,7 @@
/*
* select serial console configuration
*/
+#define CONFIG_SA1100_SERIAL
#define CONFIG_SERIAL1 1 /* we use SERIAL 1 */
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 81ee05f..77d4578 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -70,6 +70,7 @@
/*
* select serial console configuration
*/
+#define CONFIG_SA1100_SERIAL
#define CONFIG_SERIAL3 1 /* we use SERIAL 3 on ADS GCPlus */
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/lart.h b/include/configs/lart.h
index 877d5c7..e34ec22 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -52,6 +52,7 @@
/*
* select serial console configuration
*/
+#define CONFIG_SA1100_SERIAL
#define CONFIG_SERIAL3 1 /* we use SERIAL 3 on LART */
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 717036c..c8b0b16 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -59,6 +59,7 @@
/*
* select serial console configuration
*/
+#define CONFIG_SA1100_SERIAL
#define CONFIG_SERIAL3 1 /* we use SERIAL 3 */
/* allow to overwrite serial and ethaddr */