diff --git a/cpu/pxa/Makefile b/cpu/pxa/Makefile
index 5dc3a52c8d557f634493b86b39770f4dfd065062..07a151a17032d25ab23d10c975fbb6135bf99d84 100644
--- 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 14c818decc4875c2490e43b044f6d4e3a89861bc..4a35703d222805c742bf86d78b4d2fff38df3cdf 100644
--- 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 82d14014692697de00b88ee031b2258869504729..b924758dc29fc790edf82674c6b1c71dd9328df7 100644
--- 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 75c5f9bb3e07fa5523f132e9604238510a4f96cc..b150c221a3d3a940cd1ca71ad5561f6cdafb1925 100644
--- 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 ed1845009e2c17cfffe5a54c7f85ff2dcbaf0299..12bab4702a1c1a83bd470a79702da4dd2d486fcd 100644
--- 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 bacbd90b5dcb33e41cfef715328a18ae9eea534e..e7186e83990a59bd5e86f279bc84afb3c0c5cbf5 100644
--- 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 69654c7c0f5ad7b0d219f3cf64d29005cc5ae7cf..ed03ad32a0734829ff8b5343269ab9e66be5f5a8 100644
--- 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 889a9a344d4d4b77c6912b75c407c3914996c65b..5b903f0dcb604fb5ce69c89701eaed56b18c82ed 100644
--- 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 2cf9c028159763bf1466435e116c6e5fb227554d..43913cada9686c6a91aa454300e4ff21975cbb59 100644
--- 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 ed873faca7f8514f74b24ba6b9c0ca01e68a4e04..635ef71bc92c663b8829506b7b6908c55382b107 100644
--- 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 7485f7241ce1c48dee93d417a51d0ee0eb85156d..2cae8ca9b39fbcdfd06c852e559495dc01b175b4 100644
--- 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 49173181fb5f47c5eac82ab423e9aeb4dbf5115d..49045fd069d1d68f282ce6c65701b05ba39c090d 100644
--- 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 197ac0bbd6a86055e9921b11cf7ae424ef9101c6..9a20cce457b70bd75c77077857dd7a826f3a3c3b 100644
--- 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 1632d29622a4fce995c9c15a877304a4be0178ed..83883f6fd5eb23ce846f7d51f9cf80378e4a2609 100644
--- 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 c8bdf3186bb26be4c8da915fbaae9487f5ea4bbb..f18701abf573bb0dbf346405b31d5c8399bcf0e9 100644
--- 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 7e2abbf3464d78641703685f7b5c8fb5028a9c7a..2697ccaf62a1b733ef27188560d9914742abc5af 100644
--- 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 217636a61835e3b77cda6b3e32b75eea2c58dbb2..15c37087f6578f95fcab126599854ef9a8d30895 100644
--- 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 */