bcm2835_mu_serial: Convert to Kconfig

Setting config options using headers is deprecated. This patch converts
the BCM2835 Mini-UART to Kconfig.

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 4167683885a2da4a2efd8967268b7522457235d2..72281a7b64ea6b56676a550b6cd1b5e82d211a5d 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -388,6 +388,13 @@ config ATMEL_USART
          configured in the device tree, and input clock frequency can
          be got from the clk node.
 
+config BCM283X_MU_SERIAL
+       bool "Support for BCM283x Mini-UART"
+       depends on DM_SERIAL && ARCH_BCM283X
+       default y
+       help
+         Select this to enable Mini-UART support on BCM283X family of SoCs.
+
 config BCM6345_SERIAL
        bool "Support for BCM6345 UART"
        depends on DM_SERIAL && ARCH_BMIPS

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 5ffe98015fef6cfa60b6bbf87ea6d999d1d0e033..f2d3646753e8c6f2b749092b8b69efb0baa9c927 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -75,9 +75,6 @@
 #define CONFIG_MISC_INIT_R
 #endif
 
-/* Console UART, can be configured dynamically in config.txt */
-#define CONFIG_BCM283X_MU_SERIAL
-
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE              1024
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e7e5cb2f0dde84ed891a18bb55b5aa5ecb532e01..efcb251e442a57518bab607b937505b48f37c946 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -121,7 +121,6 @@ CONFIG_BCH_CONST_M
 CONFIG_BCH_CONST_PARAMS
 CONFIG_BCH_CONST_T
 CONFIG_BCM2835_GPIO
-CONFIG_BCM283X_MU_SERIAL
 CONFIG_BIOSEMU
 CONFIG_BITBANGMII_MULTI
 CONFIG_BL1_OFFSET