pl011: Convert CONFIG_PL011_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 pl011.

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f1591248c728970555f91bb28008f5d017922592..b7ca10e29090f0f7858de59048f7b4a4bfcbced2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -400,49 +400,58 @@ config TARGET_APX4DEVKIT
        bool "Support apx4devkit"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_XFI3
        bool "Support xfi3"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_M28EVK
        bool "Support m28evk"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_MX23EVK
        bool "Support mx23evk"
        select CPU_ARM926EJS
        select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select PL011_SERIAL
 
 config TARGET_MX28EVK
        bool "Support mx28evk"
        select CPU_ARM926EJS
        select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select PL011_SERIAL
 
 config TARGET_MX23_OLINUXINO
        bool "Support mx23_olinuxino"
        select CPU_ARM926EJS
        select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select PL011_SERIAL
 
 config TARGET_BG0900
        bool "Support bg0900"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_SANSA_FUZE_PLUS
        bool "Support sansa_fuze_plus"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_SC_SPS_1
        bool "Support sc_sps_1"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config ORION5X
        bool "Marvell Orion"
@@ -453,24 +462,28 @@ config TARGET_SPEAR300
        select CPU_ARM926EJS
        select BOARD_EARLY_INIT_F
        imply CMD_SAVES
+       select PL011_SERIAL
 
 config TARGET_SPEAR310
        bool "Support spear310"
        select CPU_ARM926EJS
        select BOARD_EARLY_INIT_F
        imply CMD_SAVES
+       select PL011_SERIAL
 
 config TARGET_SPEAR320
        bool "Support spear320"
        select CPU_ARM926EJS
        select BOARD_EARLY_INIT_F
        imply CMD_SAVES
+       select PL011_SERIAL
 
 config TARGET_SPEAR600
        bool "Support spear600"
        select CPU_ARM926EJS
        select BOARD_EARLY_INIT_F
        imply CMD_SAVES
+       select PL011_SERIAL
 
 config TARGET_STV0991
        bool "Support stv0991"
@@ -486,6 +499,7 @@ config TARGET_X600
        select BOARD_LATE_INIT
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore_eet"
@@ -541,14 +555,17 @@ config TARGET_VEXPRESS_CA15_TC2
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select PL011_SERIAL
 
 config TARGET_VEXPRESS_CA5X2
        bool "Support vexpress_ca5x2"
        select CPU_V7
+       select PL011_SERIAL
 
 config TARGET_VEXPRESS_CA9X4
        bool "Support vexpress_ca9x4"
        select CPU_V7
+       select PL011_SERIAL
 
 config TARGET_BCM23550_W1D
        bool "Support bcm23550_w1d"
@@ -607,6 +624,7 @@ config ARCH_S5PC1XX
 config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
+       select PL011_SERIAL
 
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
@@ -762,6 +780,7 @@ config TARGET_TS4600
        bool "Support TS4600"
        select CPU_ARM926EJS
        select SUPPORT_SPL
+       select PL011_SERIAL
 
 config ARCH_VF610
        bool "Freescale Vybrid"

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 2816121dec6450e13d9624b11c7040b86df65ed6..99aa817e639744133df8f76c094b54b120281c7b 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -453,6 +453,12 @@ config PL010_SERIAL
        help
          Select this to enable a UART for platforms using PL010.
 
+config PL011_SERIAL
+       bool "ARM PL011 driver"
+       depends on !DM_SERIAL
+       help
+         Select this to enable a UART for platforms using PL011.
+
 config ROCKCHIP_SERIAL
        bool "Rockchip on-chip UART support"
        depends on DM_SERIAL && SPL_OF_PLATDATA

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index a5a524008b4a216da740655e1ebf3bdc90124bc2..726ae8a2149bb5ff714da5a90d778d1db7f5dc48 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -22,7 +22,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          (512 * 1024)
 
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             150000000
 #define CONFIG_PL01x_PORTS             { (void *)(0xFFF36000) }
 #define CONFIG_CONS_INDEX              0

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 804b9e199c727a90465430e9696b65e53b6ecc7c..3a27c15060369d17dfa6eb4e491b3df5de845372 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -108,7 +108,6 @@
  * DUART Serial Driver.
  * Conflicts with AUART driver which can be set by board.
  */
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             24000000
 #define CONFIG_PL01x_PORTS             { (void *)MXS_UARTDBG_BASE }
 #define CONFIG_CONS_INDEX              0

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 349232e1bfd65eb2a84efcdc52579995bba1d634..c123e44d1566ccd4ad6f8bc782cc08252e009a0d 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -76,7 +76,6 @@
  * Serial Configuration (PL011)
  * CONFIG_PL01x_PORTS is defined in specific files
  */
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK                     (48 * 1000 * 1000)
 #define CONFIG_CONS_INDEX                      0
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, \

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 6203e14135678f95e70f482d0bdd4df3ab03dcc0..f18e2ee068a2287a3024f585a1122ff908d60f33 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -111,7 +111,6 @@
 /* PL011 Serial Configuration */
 #define CONFIG_CONS_INDEX              0
 #define CONFIG_PL01X_SERIAL
-#define CONFIG_PL011_SERIAL
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define CONFIG_PL011_CLOCK             7273800
 #else

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 294ca181865c8848b9bbdc79b44155fc0acd98d8..94a352fef7d5f23e311b3dbae07cca7c4a79d58e 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             24000000
 #define CONFIG_PL01x_PORTS             {(void *)CONFIG_SYS_SERIAL0, \
                                         (void *)CONFIG_SYS_SERIAL1}

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 4aa5a2a924fabbb3d15297423f601cc963eb2483..66a8e889024580a11644bcae6586bdeafc71550f 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_SERIAL1                     0xD0080000
 #define CONFIG_PL01x_PORTS                     { (void *)CONFIG_SYS_SERIAL0, \
                                                (void *)CONFIG_SYS_SERIAL1 }
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK                     (48 * 1000 * 1000)
 #define CONFIG_CONS_INDEX                      0
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 063d03bed2536045a4aefc47b7ee53d05f4d26ad..520b910bfa56c2a7f7ad6f4398e154ad3a3c39f9 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1618,7 +1618,6 @@ CONFIG_PIXIS_BRDCFG1_SSI_TDM_SSI
 CONFIG_PIXIS_BRDCFG1_TDM
 CONFIG_PIXIS_SGMII_CMD
 CONFIG_PL011_CLOCK
-CONFIG_PL011_SERIAL
 CONFIG_PL011_SERIAL_RLCR
 CONFIG_PL01X_SERIAL
 CONFIG_PL01x_PORTS