serial: Migrate CONFIG_FSL_LINFLEXUART to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years ago · fac379e1ea
parent 76dd0f2c3d
commit fac379e1ea
5 changed files with 8 additions and 6 deletions
--- 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
--- 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
--- 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);
--- 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
--- 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