From bfd45e5b8cab5d094bdc55bcd43ef1f0cd1d96ec Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 22 Jul 2021 16:14:22 +0200 Subject: [PATCH] drivers: remove Kconfig option CONFIG_UART_CONSOLE_ON_DEV_NAME Remove Kconfig option CONFIG_UART_CONSOLE_ON_DEV_NAME. Signed-off-by: Johann Fischer --- doc/reference/devicetree/api.rst | 2 +- doc/releases/release-notes-2.7.rst | 2 ++ drivers/console/Kconfig | 15 +-------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/doc/reference/devicetree/api.rst b/doc/reference/devicetree/api.rst index 6a008b3cc45..acd5dc497e1 100644 --- a/doc/reference/devicetree/api.rst +++ b/doc/reference/devicetree/api.rst @@ -319,7 +319,7 @@ device. - Flash partition that the Zephyr image's text section should be linked into * - zephyr,console - - Sets default :kconfig:`CONFIG_UART_CONSOLE_ON_DEV_NAME` + - Sets UART device used by console driver * - zephyr,dtcm - Data Tightly Coupled Memory node on some Arm SoCs * - zephyr,entropy diff --git a/doc/releases/release-notes-2.7.rst b/doc/releases/release-notes-2.7.rst index a6dfc995feb..f95e46f4c56 100644 --- a/doc/releases/release-notes-2.7.rst +++ b/doc/releases/release-notes-2.7.rst @@ -52,6 +52,8 @@ Removed APIs in this release in favor of chosen node ``zephyr,ot-uart``. * Removed ``CONFIG_UART_MCUMGR_ON_DEV_NAME`` Kconfig option in favor of direct use of chosen node ``zephyr,uart-mcumgr``. +* Removed ``CONFIG_UART_CONSOLE_ON_DEV_NAME`` Kconfig option + in favor of direct use of chosen node ``zephyr,console``. ============================ diff --git a/drivers/console/Kconfig b/drivers/console/Kconfig index 5fc1189b774..b21e14f3de4 100644 --- a/drivers/console/Kconfig +++ b/drivers/console/Kconfig @@ -6,18 +6,6 @@ # Setting shared by different subsystems -# Workaround for not being able to have commas in macro arguments -DT_CHOSEN_Z_CONSOLE := zephyr,console - -config UART_CONSOLE_ON_DEV_NAME - string "Device Name of UART Device for UART Console" - default "$(dt_chosen_label,$(DT_CHOSEN_Z_CONSOLE))" if HAS_DTS - default "UART_0" - depends on (UART_CONSOLE || CONSOLE_SUBSYS) - help - This option specifies the name of UART device to be used for - UART console. - menuconfig CONSOLE bool "Console drivers" @@ -49,8 +37,7 @@ config UART_CONSOLE depends on SERIAL && SERIAL_HAS_DRIVER select CONSOLE_HAS_DRIVER help - Enable this option to use one UART for console. Make sure - CONFIG_UART_CONSOLE_ON_DEV_NAME is also set correctly. + Enable this option to use one UART for console. config UART_CONSOLE_INIT_PRIORITY int "Init priority"