serial: Migrate CONFIG_FSL_LINFLEXUART to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig
index c59abe1bd85c95ea06817ff8ed8ffd1710f5a235..f64ed8535f99ae3072152301885c7a8545c47c52 100644 (file)
--- a/configs/s32v234evb_defconfig
+++ b/configs/s32v234evb_defconfig
@@ -12,4 +12,5 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SERIAL=y
+CONFIG_FSL_LINFLEXUART=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 3d5b2bf15f089b753f9722c0623d17cbafd143d5..4be8868536d863690e5f036dff46b6e383f9fd00 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -454,6 +454,13 @@ config BCM6345_SERIAL
        help
          Select this to enable UART on BCM6345 SoCs.
 
+config FSL_LINFLEXUART
+       bool "Freescale Linflex UART support"
+       depends on DM_SERIAL
+       help
+         Select this to enable the Linflex serial module found on some
+         NXP SoCs like S32V234.
+
 config FSL_LPUART
        bool "Freescale LPUART support"
        help

diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index fbb39592d6ce7a76352539a964184cd12c30e9ef..b706fdb398e06d321583b3cfe93cecb8fb30f033 100644 (file)
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -35,10 +35,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DM_SERIAL
-#error "The linflex serial driver does not have non-DM support."
-#endif
-
 static void _linflex_serial_setbrg(struct linflex_fsl *base, int baudrate)
 {
        u32 clk = mxc_get_clock(MXC_UART_CLK);

diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 168658e023fb1dcd0bf8048dad8648550a842e9d..127443f8825a11cfb41acdbbd6127b423e8d12fe 100644 (file)
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -57,7 +57,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 #endif
 
-#define CONFIG_FSL_LINFLEXUART
 #define LINFLEXUART_BASE               LINFLEXD0_BASE_ADDR
 
 #define CONFIG_DEBUG_UART_LINFLEXUART

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7940719418351b1914ba5edbb8068d4a5ec351a8..bd264469c2b0dc155c1612385ab97dc1d0370bed 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -673,7 +673,6 @@ CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_LAYERSCAPE
 CONFIG_FSL_LBC
-CONFIG_FSL_LINFLEXUART
 CONFIG_FSL_MC9SDZ60
 CONFIG_FSL_MEMAC
 CONFIG_FSL_NGPIXIS