s3c24x0: move serial driver to drivers/serial

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

diff --git a/cpu/arm920t/s3c24x0/Makefile b/cpu/arm920t/s3c24x0/Makefile
index 676492025ae81b6abc8f7e5576d787f2a4dec259..8fd525e12e0cd0ea2ea011348ab41a45b722d345 100644 (file)
--- a/cpu/arm920t/s3c24x0/Makefile
+++ b/cpu/arm920t/s3c24x0/Makefile
@@ -25,8 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(SOC).a
 
-COBJS  = i2c.o interrupts.o serial.o speed.o \
-         usb.o usb_ohci.o nand.o
+COBJS  = i2c.o interrupts.o speed.o usb.o usb_ohci.o nand.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 705ae473b9c4ee64701ffd9946b4f1c7518e99e0..696d5fbbba91ad83fe4e21d55d05250f6a8a6cc2 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -44,6 +44,7 @@ COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o
 COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o
+COBJS-$(CONFIG_S3C24X0_SERIAL) += serial_s3c24x0.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/arm920t/s3c24x0/serial.c b/drivers/serial/serial_s3c24x0.c
similarity index 97%
rename from cpu/arm920t/s3c24x0/serial.c
rename to drivers/serial/serial_s3c24x0.c
index 064b99871d06d95dedf7244e687783dfe2d31253..1b1b7a612e879162d45c109f9a480623502f30bb 100644 (file)
--- a/cpu/arm920t/s3c24x0/serial.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -19,8 +19,6 @@
  */
 
 #include <common.h>
-#if defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB)
-
 #if defined(CONFIG_S3C2400) || defined(CONFIG_TRAB)
 #include <s3c2400.h>
 #elif defined(CONFIG_S3C2410)
@@ -300,5 +298,3 @@ struct serial_device s3c24xx_serial2_device =
        INIT_S3C_SERIAL_STRUCTURE(2, "s3ser2", "S3UART3");
 
 #endif /* CONFIG_SERIAL_MULTI */
-
-#endif /* defined(CONFIG_S3C2400) || defined (CONFIG_S3C2410) || defined (CONFIG_TRAB) */

diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 8550223d4dbbf5c7204594607fe8451928560bce..5e614fd8e8186bd9094f5b4b855a0933e0a32ea0 100644 (file)
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -117,6 +117,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1          1      /* we use SERIAL 1 on VCMA9 */
 
 /************************************************************

diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index 102c45a33e9f1cc11c25aa17148afb77a9997a46..2b659e30ced4fe6dd11cb54d4c39350fb8591fcf 100644 (file)
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -70,6 +70,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1          1      /* we use SERIAL 1 on SBC2410X */
 
 /************************************************************

diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 856d1fb16c29bf0f74cca99c60a647f1e56a190e..ffdf21768b000e12b759552003104b92372e91fd 100644 (file)
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -63,6 +63,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1          1      /* we use SERIAL 1 on SAMSUNG */
 
 #undef CONFIG_HWFLOW                   /* include RTS/CTS flow control support */

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 797a59684cd97f4df369f5e90d9bb7b3362090cd..fb437069daaa9b51a3f07889535cc90511d89963 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -60,6 +60,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1          1      /* we use SERIAL 1 on SMDK2410 */
 
 /************************************************************

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 625d8ee8ba0d7c3cc39950019a4a9e519b8b53fc..520fe368de2caff6b551af10b80a03079fd8e6eb 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -111,6 +111,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C24X0_SERIAL
 #define CONFIG_SERIAL1         1       /* we use SERIAL 1 on TRAB */
 
 #define CONFIG_HWFLOW                  /* include RTS/CTS flow control support */