arm720t/clps7111: move serial driver to drivers/serial

add CONFIG_CLPS7111_SERIAL to activate the driver

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/arm720t/Makefile b/cpu/arm720t/Makefile
index a038042f9f846a71f3f16da9e04fa3b147be4dea..d5ac7d3fd980e66e909bbe55dadaf3c3906c3737 100644 (file)
--- a/cpu/arm720t/Makefile
+++ b/cpu/arm720t/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),$(COBJS) $(SOBJS))

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index eaf4f8e5df4401b30aa57170f0e0d212f54719a6..6ab847f00f858b44695cf59438c4f7cc60f6829a 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -33,6 +33,7 @@ COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
+COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o
 COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
 COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
 COBJS-$(CONFIG_LPC2292_SERIAL) += serial_lpc2292.o

diff --git a/cpu/arm720t/serial.c b/drivers/serial/serial_clps7111.c
similarity index 96%
rename from cpu/arm720t/serial.c
rename to drivers/serial/serial_clps7111.c
index b54d1cff60970a4e8254fcc1480c7b48b4eb89c7..a6aecadd13df66818175c230270bc9ced2166621 100644 (file)
--- a/cpu/arm720t/serial.c
+++ b/drivers/serial/serial_clps7111.c
@@ -29,9 +29,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_ARMADILLO)
-
 #include <clps7111.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -122,4 +119,3 @@ serial_puts (const char *s)
                serial_putc (*s++);
        }
 }
-#endif

diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index ef6ce229cd09278580bca4dba344306d70aefbc3..7ba5e174e2d1f1e799dd6ff044577a972029c0b3 100644 (file)
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -64,6 +64,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_CLPS7111_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index d12b13f07a25b4054f9e6d032ed8d7e0f222988c..630fff3903ac4dfc505ce82df4ed3f0159b23645 100644 (file)
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -55,6 +55,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_CLPS7111_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index efd4214d910dd36d9c2af3c5166a169d7fe66944..c7001cc7de87c9a3152eb21c73ff53b500a13c5a 100644 (file)
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -54,6 +54,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_CLPS7111_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
 /* allow to overwrite serial and ethaddr */