serial: pxa: use kconfig for serial configuration

Migrate the PXA serial driver to be configured via Kconfig.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Marek Vasut <marex@denx.de>

diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 9a57041c36a9eb62e3c19444307b67da0a6d0e79..85740c21265ccbf5482d7920014197d9d9a5409f 100644 (file)
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_PXA_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index c1b359e54d73ed6bef80cf18ec327a61d175b202..a47159a283d0ff7a7a4bff7fd0f7864b6bed7704 100644 (file)
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -24,3 +24,4 @@ CONFIG_SYS_PROMPT="> "
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
+CONFIG_PXA_SERIAL=y

diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 8eb9be4357b973f8647a6e7dfbcf108b25367b7d..584657995477da8ea06265235cc0a671043a0098 100644 (file)
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_PXA_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 56c024f97a140c87121e3c228ef25e28c2691fed..620dd82d6b91657d9f0763c295bcb103435357a9 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -407,4 +407,10 @@ config MSM_SERIAL
          for example APQ8016 and MSM8916.
          Single baudrate is supported in current implementation (115200).
 
+config PXA_SERIAL
+       bool "PXA serial port support"
+       help
+         If you have a machine based on a Marvell XScale PXA2xx CPU you
+         can enable its onboard serial ports by enabling this option.
+
 endmenu

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index e44a84729bc34b987663987cf444caa73a615f0c..b16abdc9ec9e4ba55e773f8e08f1545f17c6b439 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -43,7 +43,6 @@
 /*
  * Serial Console Configuration
  */
-#define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
 #define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 115200

diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 8e77982580fe1022b2e18491198ef4a402670889..18b5488392de04daf60f859fa3c370fb5f02edb9 100644 (file)
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -107,8 +107,6 @@
 /*
  * Serial port
  */
-
-#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART
 #define CONFIG_CONS_INDEX              3
 

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index ed2c9acdb1d9a0a3141f87f66fb6c5a567f520d1..97dfc0e6ec10c150a52522fe8fea038b1902d562 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -49,7 +49,6 @@
  * Serial Console Configuration
  * STUART - the lower serial port on Colibri board
  */
-#define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
 #define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc2a08a85661662a07ffd0f717da52fb82c923db..d6b2a457b41ad75f57da9f325c7bd2d985df8636 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3740,7 +3740,6 @@ CONFIG_PWM_IMX
 CONFIG_PXA_LCD
 CONFIG_PXA_MMC_GENERIC
 CONFIG_PXA_PWR_I2C
-CONFIG_PXA_SERIAL
 CONFIG_PXA_STD_I2C
 CONFIG_PXA_VGA
 CONFIG_PXA_VIDEO