ixp: move serial to drivers/serial

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

diff --git a/cpu/ixp/Makefile b/cpu/ixp/Makefile
index 6deecd4da1eb111d245d8965a9bf1235165c0a3e..7e98d870261918f866c2e57306fc8f95689e1d8b 100644 (file)
--- 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 c7a1882ef8e8f4249d0f24b59d8a2766879515fa..b6fd0d774698b30e8a0e1bdb59d269138b2c3d5d 100644 (file)
--- 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 58d56ee8c931f482e56d504ea491d739334a0a0b..adbc39951c4ca021ca88e2d3b23675fb2b434316 100644 (file)
--- 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 6f59a510e73c8d26751b5d671c19399d8f9616be..4c579ebe2f78977c5502cb2f1143157ba80b0c03 100644 (file)
--- 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 a7bb38c912a5b9915bff7ce9cfbecc3650df10a7..694f52254a2f583e1b383f2f1f52d9ea1147fd27 100644 (file)
--- 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 f2b701f8f156181367be90154d067e99a89d0cf7..cdc995672572cc1186677f59d93e7ab201552330 100644 (file)
--- 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 edebb40e1d8ab07ead3f4332793d71c23f399fd9..70f39873655b647d8baac79cbdd14fc521dfef64 100644 (file)
--- 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 528bccdabd20d0c223c78d03684ece6998607751..193008e0ef36b2a0e955f18c4d6c5d38105f3232 100644 (file)
--- 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 f8aac1aba3ddd453984864444961777cba6667a8..4da401f46bc12141561b894680bd076482ad0bca 100644 (file)
--- 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 */