Skip to content

shell: remove Kconfig option CONFIG_UART_SHELL_ON_DEV_NAME #37902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2021
Merged

shell: remove Kconfig option CONFIG_UART_SHELL_ON_DEV_NAME #37902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/reference/devicetree/api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ device.
* - zephyr,ot-uart
- Used by the OpenThread to specify UART device for Spinel protocol
* - zephyr,shell-uart
- Sets default :kconfig:`CONFIG_UART_SHELL_ON_DEV_NAME`
- Sets UART device used by serial shell backend
* - zephyr,sram
- A node whose ``reg`` sets the base address and size of SRAM memory
available to the Zephyr image, used during linking
Expand Down
2 changes: 2 additions & 0 deletions doc/releases/release-notes-2.7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Removed APIs in this release
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``.
* Removed ``CONFIG_UART_SHELL_ON_DEV_NAME`` Kconfig option
in favor of direct use of chosen node ``zephyr,shell-uart``.

============================

Expand Down
8 changes: 4 additions & 4 deletions samples/subsys/shell/shell_module/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ common:
- native_posix
tests:
sample.shell.shell_module:
filter: ( CONFIG_SERIAL and CONFIG_UART_SHELL_ON_DEV_NAME )
filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
tags: shell
harness: keyboard
min_ram: 40
Expand All @@ -17,12 +17,12 @@ tests:
extra_args: OVERLAY_CONFIG="overlay-usb.conf"
DTC_OVERLAY_FILE="usb.overlay"
sample.shell.shell_module.minimal:
filter: ( CONFIG_SERIAL and CONFIG_UART_SHELL_ON_DEV_NAME )
filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
tags: shell
harness: keyboard
extra_args: CONF_FILE="prj_minimal.conf"
sample.shell.shell_module.getopt:
filter: ( CONFIG_SERIAL and CONFIG_UART_SHELL_ON_DEV_NAME )
filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
tags: shell
harness: keyboard
min_ram: 40
Expand All @@ -33,7 +33,7 @@ tests:
harness: keyboard
extra_args: CONF_FILE="prj_minimal_rtt.conf"
sample.shell.shell_module.login:
filter: ( CONFIG_SERIAL and CONFIG_UART_SHELL_ON_DEV_NAME )
filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart")
tags: shell
harness: keyboard
min_ram: 40
Expand Down
6 changes: 2 additions & 4 deletions samples/subsys/shell/shell_module/src/uart_reinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

void shell_init_from_work(struct k_work *work)
{
const struct device *dev =
device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
bool log_backend = CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > 0;
uint32_t level =
(CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > LOG_LEVEL_DBG) ?
Expand Down Expand Up @@ -86,8 +85,7 @@ K_TIMER_DEFINE(uart_poll_timer, uart_poll_timeout, uart_poll_timer_stopped);
static void shell_uninit_cb(const struct shell *shell, int res)
{
__ASSERT_NO_MSG(res >= 0);
const struct device *dev =
device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));

if (IS_ENABLED(CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN)) {
/* connect uart to my handler */
Expand Down
14 changes: 0 additions & 14 deletions subsys/shell/Kconfig.backends
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@ config SHELL_PROMPT_UART
help
Displayed prompt name for UART backend.

# Workaround for not being able to have commas in macro arguments
DT_CHOSEN_Z_SHELL_UART := zephyr,shell-uart

config UART_SHELL_ON_DEV_NAME
string "Device Name of UART Device for SHELL_BACKEND_SERIAL"
default "$(dt_chosen_label,$(DT_CHOSEN_Z_SHELL_UART))" if HAS_DTS
default "UART_0"
help
This option specifies the name of UART device to be used for the
SHELL UART backend.
In case when DTS is enabled (HAS_DTS), the default value is
set from DTS chosen node 'zephyr,shell-uart' but can be overridden
here.

# Internal config to enable UART interrupts if supported.
config SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN
bool "Interrupt driven"
Expand Down
5 changes: 2 additions & 3 deletions subsys/shell/shell_uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,13 @@ const struct shell_transport_api shell_uart_transport_api = {
static int enable_shell_uart(const struct device *arg)
{
ARG_UNUSED(arg);
const struct device *dev =
device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
bool log_backend = CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > 0;
uint32_t level =
(CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > LOG_LEVEL_DBG) ?
CONFIG_LOG_MAX_LEVEL : CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL;

if (dev == NULL) {
if (!device_is_ready(dev)) {
return -ENODEV;
}

Expand Down