pxa: move serial driver to drivers/serial

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

diff --git a/cpu/pxa/Makefile b/cpu/pxa/Makefile
index 5dc3a52..07a151a 100644 (file)
--- a/cpu/pxa/Makefile
+++ b/cpu/pxa/Makefile
@@ -30,7 +30,6 @@ START = start.o
 COBJS  += cpu.o
 COBJS  += i2c.o
 COBJS  += pxafb.o
-COBJS  += serial.o
 COBJS  += timer.o
 COBJS  += usb.o
 

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 14c818d..4a35703 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -44,6 +44,7 @@ COBJS-$(CONFIG_MX31_UART) += serial_mx31.o
 COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o
 COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
 COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
+COBJS-$(CONFIG_PXA_SERIAL) += serial_pxa.o
 COBJS-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o
 COBJS-$(CONFIG_S3C24X0_SERIAL) += serial_s3c24x0.o
 COBJS-$(CONFIG_S3C44B0_SERIAL) += serial_s3c44b0.o

diff --git a/cpu/pxa/serial.c b/drivers/serial/serial_pxa.c
similarity index 100%
rename from cpu/pxa/serial.c
rename to drivers/serial/serial_pxa.c

diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index 82d1401..b924758 100644 (file)
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -60,6 +60,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART       1  /* we use FFUART on CERF PXA */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 75c5f9b..b150c22 100644 (file)
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -57,6 +57,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1       /* we use FFUART on LUBBOCK */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index ed18450..12bab47 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -53,6 +53,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1       /* we use FFUART on CSB226          */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/delta.h b/include/configs/delta.h
index bacbd90..e7186e8 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -82,6 +82,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 69654c7..ed03ad3 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -50,6 +50,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1       /* we use FFUART on CSB226 */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 889a9a3..5b903f0 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -50,6 +50,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1       /* we use FFUART                    */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 2cf9c02..43913ca 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -64,6 +64,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on LUBBOCK */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index ed873fa..635ef71 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -62,6 +62,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on PLEB 2 */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 7485f72..2cae8ca 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -100,6 +100,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART on LUBBOCK */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 4917318..49045fd 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -65,6 +65,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_FFUART         1       /* we use FFUART on Conxs */
 #define CONFIG_BTUART         1       /* we use BTUART on Conxs */

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index 197ac0b..9a20cce 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -33,6 +33,7 @@
 /*
  * Select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_BTUART          1       /* BTUART is default on WEP dev board */
 #define CONFIG_BAUDRATE   115200
 

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 1632d29..83883f6 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -55,6 +55,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_BTUART         1       /* we use BTUART on XAENIAX */
 
 

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index c8bdf31..f18701a 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -77,6 +77,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1       /* we use FFUART */
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 7e2abbf..2697cca 100644 (file)
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -99,6 +99,7 @@
 #define CONFIG_SMC_USE_32_BIT          1
 
 /* select serial console configuration */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART                  1
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 217636a..15c3708 100644 (file)
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -72,6 +72,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART         1
 
 /* allow to overwrite serial and ethaddr */