pl010: Convert CONFIG_PL010_SERIAL to Kconfig

We want to use Kconfig logic to depend on whether pl01x devices
are built in, so let's convert their inclusion selection to Kconfig.

This round goes to pl010.

Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0b9eb11..f159124 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -348,6 +348,7 @@ config ARCH_AT91
 config TARGET_EDB93XX
        bool "Support edb93xx"
        select CPU_ARM920T
+       select PL010_SERIAL
 
 config TARGET_ASPENITE
        bool "Support aspenite"

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7b20b47..2816121 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -447,6 +447,12 @@ config INTEL_MID_SERIAL
          Select this to enable a UART for Intel MID platforms.
          This uses the ns16550 driver as a library.
 
+config PL010_SERIAL
+       bool "ARM PL010 driver"
+       depends on !DM_SERIAL
+       help
+         Select this to enable a UART for platforms using PL010.
+
 config ROCKCHIP_SERIAL
        bool "Rockchip on-chip UART support"
        depends on DM_SERIAL && SPL_OF_PLATDATA

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 8fcc791..fcad7c4 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -80,7 +80,6 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O buffer size */
 
 /* Serial port hardware configuration */
-#define CONFIG_PL010_SERIAL
 #define CONFIG_CONS_INDEX              0
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, \
                         115200, 230400}

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 76999ad..063d03b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1617,7 +1617,6 @@ CONFIG_PIXIS_BRDCFG1_SSI_TDM_MASK
 CONFIG_PIXIS_BRDCFG1_SSI_TDM_SSI
 CONFIG_PIXIS_BRDCFG1_TDM
 CONFIG_PIXIS_SGMII_CMD
-CONFIG_PL010_SERIAL
 CONFIG_PL011_CLOCK
 CONFIG_PL011_SERIAL
 CONFIG_PL011_SERIAL_RLCR