aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD2009-03-29 23:01:42 +0200
committerJean-Christophe PLAGNIOL-VILLARD2009-03-29 23:01:42 +0200
commit176a600d0ecdaccbac483d2ba992d0119f853119 (patch)
tree545e4c747964495d0b0841a2ba4771a27c7035a4
parent6d27bca15d445fcf07d6e7e30ced95c945c875ea (diff)
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>
-rw-r--r--cpu/arm920t/ks8695/Makefile2
-rw-r--r--drivers/serial/Makefile1
-rw-r--r--drivers/serial/serial_ks8695.c (renamed from cpu/arm920t/ks8695/serial.c)0
-rw-r--r--include/configs/cm4008.h1
-rw-r--r--include/configs/cm41xx.h1
5 files changed, 4 insertions, 1 deletions
diff --git a/cpu/arm920t/ks8695/Makefile b/cpu/arm920t/ks8695/Makefile
index 7db9473524a..f6b006300b1 100644
--- 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 619d9da1a1c..95255df5fe6 100644
--- 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
index aacd1be630b..aacd1be630b 100644
--- a/cpu/arm920t/ks8695/serial.c
+++ b/drivers/serial/serial_ks8695.c
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 124fad7b35a..7ea1a46033b 100644
--- 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 5c255ce39a5..ea374da86e8 100644
--- 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