ks8695: move serial driver to drivers/serial

add CONFIG_KS8695_SERIAL to activate the driver

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

diff --git a/cpu/arm920t/ks8695/Makefile b/cpu/arm920t/ks8695/Makefile
index 7db9473524a208c04d838c2d9c561ab374656984..f6b006300b120efa2128ae35e224a1ba8d3c247a 100644 (file)
--- a/cpu/arm920t/ks8695/Makefile
+++ b/cpu/arm920t/ks8695/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(SOC).a
 
-COBJS  = interrupts.o serial.o
+COBJS  = interrupts.o
 SOBJS  = lowlevel_init.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 619d9da1a1ccd1ef716f21a4a8d79afcd74b9077..95255df5fe6f1bd47a778c247f633aa81e75874e 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
 COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
+COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.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/arm920t/ks8695/serial.c b/drivers/serial/serial_ks8695.c
similarity index 100%
rename from cpu/arm920t/ks8695/serial.c
rename to drivers/serial/serial_ks8695.c

diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 124fad7b35afcf56c3ec81eac3b46f8d1b9ca1c4..7ea1a46033ba2fa2ec3eabdaf7ab0afabf5e49d1 100644 (file)
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -53,6 +53,7 @@
  * select serial console configuration
  */
 #define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_KS8695_SERIAL
 #define        CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 5c255ce39a5a6f3c14dbe5f9f7b7c2807a974861..ea374da86e88cbd5315ea0f2c2bf753e52ad18d3 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -53,6 +53,7 @@
  * select serial console configuration
  */
 #define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_KS8695_SERIAL
 #define        CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200