From 930590f3e49c8f32256edf2e5861e1535a329c6c Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 31 Jan 2009 09:10:48 +0100
Subject: [PATCH] ixp: move serial to drivers/serial

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 cpu/ixp/Makefile                                | 1 -
 drivers/serial/Makefile                         | 1 +
 cpu/ixp/serial.c => drivers/serial/serial_ixp.c | 0
 include/configs/actux1.h                        | 1 +
 include/configs/actux2.h                        | 1 +
 include/configs/actux3.h                        | 1 +
 include/configs/actux4.h                        | 1 +
 include/configs/ixdp425.h                       | 1 +
 include/configs/ixdpg425.h                      | 1 +
 include/configs/pdnb3.h                         | 1 +
 10 files changed, 8 insertions(+), 1 deletion(-)
 rename cpu/ixp/serial.c => drivers/serial/serial_ixp.c (100%)

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index 6deecd4da1..7e98d87026 100644
--- a/cpu/ixp/Makefile
+++ b/cpu/ixp/Makefile
@@ -28,7 +28,6 @@ LIB	= $(obj)lib$(CPU).a
 START	= start.o
 COBJS-y	+= cpu.o
 COBJS-y	+= interrupts.o
-COBJS-y	+= serial.o
 ifndef CONFIG_USE_IRQ
 COBJS-y	+= timer.o
 endif
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index c7a1882ef8..b6fd0d7746 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -32,6 +32,7 @@ COBJS-y += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
 COBJS-y += serial.o
+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
diff --git a/cpu/ixp/serial.c b/drivers/serial/serial_ixp.c
similarity index 100%
rename from cpu/ixp/serial.c
rename to drivers/serial/serial_ixp.c
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 58d56ee8c9..adbc39951c 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -39,6 +39,7 @@
 #define CONFIG_DISPLAY_CPUINFO		1
 #define CONFIG_DISPLAY_BOARDINFO	1
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE		IXP425_UART2
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTDELAY		3
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index 6f59a510e7..4c579ebe2f 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -32,6 +32,7 @@
 #define CONFIG_DISPLAY_CPUINFO		1
 #define CONFIG_DISPLAY_BOARDINFO	1
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE		IXP425_UART2
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTDELAY		5
diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index a7bb38c912..694f52254a 100644
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -32,6 +32,7 @@
 #define CONFIG_DISPLAY_CPUINFO		1
 #define CONFIG_DISPLAY_BOARDINFO	1
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE		IXP425_UART2
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTDELAY		3
diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index f2b701f8f1..cdc9956725 100644
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -32,6 +32,7 @@
 #define CONFIG_DISPLAY_CPUINFO		1
 #define CONFIG_DISPLAY_BOARDINFO	1
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE		IXP425_UART1
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTDELAY		3
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index edebb40e1d..70f3987365 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -135,6 +135,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_IXP_SERIAL
 #define CONFIG_SYS_IXP425_CONSOLE	IXP425_UART1   /* we use UART1 for console */
 
 /*
diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index 528bccdabd..193008e0ef 100644
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -72,6 +72,7 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_BAUDRATE         115200
 #define CONFIG_SYS_IXP425_CONSOLE	IXP425_UART1   /* we use UART1 for console */
 
diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index f8aac1aba3..4da401f46b 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -68,6 +68,7 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
+#define CONFIG_IXP_SERIAL
 #define CONFIG_BAUDRATE         115200
 #define CONFIG_SYS_IXP425_CONSOLE	IXP425_UART1   /* we use UART1 for console */
 
-- 
2.39.5