Setting config options using headers is deprecated. This patch converts the BCM2835 Mini-UART to Kconfig.
Signed-off-by: Alexander Graf agraf@suse.de --- drivers/serial/Kconfig | 7 +++++++ include/configs/rpi.h | 3 --- scripts/config_whitelist.txt | 1 - 3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 4167683885..72281a7b64 100644 --- 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 5ffe98015f..f2d3646753 100644 --- 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 6e4e322986..5e02588066 100644 --- 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