Skip to content

usb: patches to resolve issues around Kconfig option USB_UART_CONSOLE #40220

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

Closed
wants to merge 13 commits into from
+184 −168
Closed

usb: patches to resolve issues around Kconfig option USB_UART_CONSOLE #40220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee570c8
usb: cdc_acm: use same init level and priority as serial drivers
jfischer-no Nov 9, 2021
b0dc396
usb: limit scope of CONFIG_USB_UART_CONSOLE
jfischer-no Nov 9, 2021
623ace0
usb: deprecate Kconfig option USB_UART_CONSOLE
jfischer-no Nov 9, 2021
9b88cba
usb: add option to initialize USB device support at boot
jfischer-no Nov 12, 2021
4d53a79
shields: add generic shield to use CDC ACM UART as backend
jfischer-no Nov 12, 2021
1d52620
samples: shell_module: use generic CDC ACM shield
jfischer-no Nov 12, 2021
a92896b
tests: bluetooth: shell: use generic CDC ACM shield
jfischer-no Nov 12, 2021
561c894
tests: uart_basic_api: use generic CDC ACM shield
jfischer-no Nov 12, 2021
461b174
samples: sensortile_box: use generic CDC ACM shield
jfischer-no Nov 12, 2021
74b92d7
samples: usb: console: fix configuration
jfischer-no Nov 12, 2021
9c03497
boards: clean up CDC ACM configuration for nRF52840 based boards
jfischer-no Nov 12, 2021
105e3da
usb: remove the remains of USB_UART_CONSOLE
jfischer-no Nov 12, 2021
6c32698
shields: cdc_acm: add support for zephyr,bt-c2h-uart property
jfischer-no Nov 12, 2021
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
10 changes: 0 additions & 10 deletions boards/arm/arduino_nano_33_ble/Kconfig.board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ config BOARD_ARDUINO_NANO_33_BLE
bool "Arduino Nano 33 BLE board"
depends on SOC_NRF52840_QIAA

config BOARD_ARDUINO_NANO_33_BLE_EN_USB_CONSOLE
Copy link
Contributor

@tejlmand tejlmand Nov 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so all boards cleaned up in this commit 9c03497 must now use -DSHIELD=cdc_acm_console

That sounds like a step backward in user-friendliness if those boards are expected to always use the usb as console.

For example, this board bl654_usb doesn't seem to have any other option than using USB for console:
https://docs.zephyrproject.org/latest/boards/arm/bl654_usb/doc/bl654_usb.html

@kieran-mackey FYI.

Copy link
Contributor Author

@jfischer-no jfischer-no Nov 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is a step forward, only with these patches it becomes possible to use CDC ACM UART (not usb) as backend for console. The configuration of this board in the tree is not usable.

Copy link
Contributor

@tejlmand tejlmand Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configuration of this board in the tree is not usable.

Which board or all boards ?

Read my comment:

so all boards cleaned up in this commit 9c03497 must now use -DSHIELD=cdc_acm_console

i'm refering to the entire commit 9c03497, not a single board, but github requires me to put the comment on a single line.
That is, my comment covers all those boards you are modifying in that commit:

  • arduino_nano_33_ble
  • bl654_usb
  • degu_evk
  • nrf52840dongle_nrf52840

are you saying that the current configuration in Zephyr of those boards are not working for any of them ?

Copy link
Contributor

@tejlmand tejlmand Nov 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as far as I'm aware, the general problem started with this cleanup:
d12331e
which again was fixing:
#38403
caused by this:
#37512

So maybe we should go back to the origin of the problem, instead of completely changing how users must use the boards.

bool "Sends the console output over the USB port"
depends on BOARD_ARDUINO_NANO_33_BLE
select SERIAL
select USB_DEVICE_STACK
select CONSOLE
select PRINTK
select UART_INTERRUPT_DRIVEN
select USB_UART_CONSOLE

config BOARD_ARDUINO_NANO_33_BLE_INIT_SENSORS
bool "Initializes the internal I2C sensors on the board"
depends on BOARD_ARDUINO_NANO_33_BLE
10 changes: 0 additions & 10 deletions boards/arm/bl654_usb/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ config FLASH_LOAD_OFFSET
default 0x1000
depends on !USE_DT_CODE_PARTITION

if USB_DEVICE_STACK

config USB_UART_CONSOLE
default y

config UART_LINE_CTRL
default y

endif # USB_DEVICE_STACK

if IEEE802154

config IEEE802154_NRF5
Expand Down
8 changes: 0 additions & 8 deletions boards/arm/bl654_usb/bl654_usb.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &bl654_cdc_acm_uart;
zephyr,shell-uart = &bl654_cdc_acm_uart;
zephyr,bt-c2h-uart = &bl654_cdc_acm_uart;
zephyr,code-partition = &slot0_partition;
};

Expand Down Expand Up @@ -104,9 +101,4 @@
zephyr_udc0: &usbd {
compatible = "nordic,nrf-usbd";
status = "okay";

bl654_cdc_acm_uart: bl654_cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
3 changes: 0 additions & 3 deletions boards/arm/bl654_usb/bl654_usb_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ CONFIG_CONSOLE=y
# Enable GPIO
CONFIG_GPIO=y

# Enable USB
CONFIG_USB_DEVICE_STACK=y

# Additional board options
CONFIG_GPIO_AS_PINRESET=y

Expand Down
16 changes: 0 additions & 16 deletions boards/arm/degu_evk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@ if BOARD_DEGU_EVK
config BOARD
default "degu_evk"

if USB_DEVICE_STACK

config USB_DEVICE_PRODUCT
default "Degu Evaluation Kit"

config USB_UART_CONSOLE
default y

config UART_INTERRUPT_DRIVEN
default y

config UART_LINE_CTRL
default y

endif # USB_DEVICE_STACK

if DISK_DRIVER_FLASH

config DISK_FLASH_DEV_NAME
Expand Down
9 changes: 2 additions & 7 deletions boards/arm/degu_evk/degu_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &degu_cdc_acm_uart;
zephyr,shell-uart = &degu_cdc_acm_uart;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,code-partition = &slot0_partition;
};

Expand Down Expand Up @@ -143,9 +143,4 @@
zephyr_udc0: &usbd {
compatible = "nordic,nrf-usbd";
status = "okay";

degu_cdc_acm_uart: degu_cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
3 changes: 0 additions & 3 deletions boards/arm/degu_evk/degu_evk_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ CONFIG_SERIAL=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y

# enable USB
CONFIG_USB_DEVICE_STACK=y

# additional board options
CONFIG_GPIO=y
CONFIG_GPIO_AS_PINRESET=y
Expand Down
8 changes: 0 additions & 8 deletions boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ config FLASH_LOAD_OFFSET
default 0x1000
depends on BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION

if USB_DEVICE_STACK

# Enable UART driver, needed for CDC ACM
config SERIAL
default y

endif # USB_DEVICE_STACK

config BT_CTLR
default BT

Expand Down