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>

diff --git a/cpu/sa1100/Makefile b/cpu/sa1100/Makefile
index 790faebd3977910c9ed2bf8f00ea7235ccb8e6ca..fd696f7efb194948f591671d4c192f6c4140d59a 100644 (file)
--- 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 37cc5a06d7e203ef4f4b2086eaedb7a60a14dc2d..8cac794a41e81163b42c12fd9ea1597b59f443b6 100644 (file)
--- 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
similarity index 100%
rename from cpu/sa1100/serial.c
rename to drivers/serial/serial_sa1100.c

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 4da68b3e7045e850f6b9f1876cf6ea260c09e1ca..a6c442b51a65144d1fbb1c4a48ecea3b97159013 100644 (file)
--- 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 3f658a7b4ac27381be99d79abd8876b3c41a6d90..8f615bdb8448b071794031ec10ca82c6bb2c3e0d 100644 (file)
--- 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 81ee05ffaad67982d1f243b28fa6a54b542a2ce9..77d45783c3187824b9a0ca533fdbb78019c0043a 100644 (file)
--- 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 877d5c76ba7bd3d28752936a11ec55a5d9e5b7b8..e34ec222b890372e8a05cc27b987ac289e0c1332 100644 (file)
--- 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 717036c3cb2f7035a4ece0f4339583c7878a8e6a..c8b0b161d8cf81f641ac8e72297d66d5afe21ff4 100644 (file)
--- 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 */