From 11c7371f99ba6337489a63852c505f5163d36fa0 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 19 Dec 2022 14:14:45 +0000 Subject: [PATCH] samples: Explicitly disable boot USB device support init at boot Disables having USB enabled for boards that configure USB CDC for console, shell or logging at bootup in applications that enable USB to prevent a conflict arising whereby USB is registered from multiple points and later calls fail. Signed-off-by: Jamie McCrae --- samples/bluetooth/hci_uart/boards/nrf52840dongle_nrf52840.conf | 1 + samples/bluetooth/hci_usb/prj.conf | 1 + samples/bluetooth/hci_usb_h4/prj.conf | 1 + samples/boards/sensortile_box/prj.conf | 1 + samples/net/sockets/echo_server/overlay-netusb.conf | 1 + samples/net/wpan_serial/prj.conf | 1 + samples/net/wpanusb/prj.conf | 1 + samples/net/zperf/overlay-netusb.conf | 1 + samples/sensor/fxos8700-hid/prj.conf | 1 + samples/subsys/mgmt/mcumgr/smp_svr/overlay-cdc.conf | 1 + samples/subsys/modbus/rtu_server/overlay-cdc-acm.conf | 1 + samples/subsys/shell/shell_module/overlay-usb.conf | 1 + samples/subsys/tracing/prj_usb.conf | 1 + samples/subsys/tracing/prj_usb_ctf.conf | 1 + samples/subsys/usb/audio/headphones_microphone/prj.conf | 1 + samples/subsys/usb/audio/headset/prj.conf | 1 + samples/subsys/usb/cdc_acm/prj.conf | 1 + samples/subsys/usb/cdc_acm_composite/prj.conf | 1 + samples/subsys/usb/console/prj.conf | 1 + samples/subsys/usb/dfu/prj.conf | 1 + samples/subsys/usb/hid-cdc/prj.conf | 1 + samples/subsys/usb/hid-mouse/prj.conf | 1 + samples/subsys/usb/hid/prj.conf | 1 + samples/subsys/usb/mass/prj.conf | 1 + samples/subsys/usb/testusb/prj.conf | 1 + samples/subsys/usb/webusb/prj.conf | 1 + 26 files changed, 26 insertions(+) diff --git a/samples/bluetooth/hci_uart/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/hci_uart/boards/nrf52840dongle_nrf52840.conf index b805adbec27..72c806e1d3d 100644 --- a/samples/bluetooth/hci_uart/boards/nrf52840dongle_nrf52840.conf +++ b/samples/bluetooth/hci_uart/boards/nrf52840dongle_nrf52840.conf @@ -1,3 +1,4 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr HCI UART sample" CONFIG_USB_CDC_ACM=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/bluetooth/hci_usb/prj.conf b/samples/bluetooth/hci_usb/prj.conf index 74678990bf4..110cea092d1 100644 --- a/samples/bluetooth/hci_usb/prj.conf +++ b/samples/bluetooth/hci_usb/prj.conf @@ -2,6 +2,7 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_GPIO=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_BT=y CONFIG_BT_HCI_RAW=y diff --git a/samples/bluetooth/hci_usb_h4/prj.conf b/samples/bluetooth/hci_usb_h4/prj.conf index 99a1cc1bbda..77f48fca5a2 100644 --- a/samples/bluetooth/hci_usb_h4/prj.conf +++ b/samples/bluetooth/hci_usb_h4/prj.conf @@ -2,6 +2,7 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_GPIO=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PID=0x000C diff --git a/samples/boards/sensortile_box/prj.conf b/samples/boards/sensortile_box/prj.conf index 5fd052d1ecf..0f6ffa4f97e 100644 --- a/samples/boards/sensortile_box/prj.conf +++ b/samples/boards/sensortile_box/prj.conf @@ -22,6 +22,7 @@ CONFIG_USB_DEVICE_PID=0x1234 CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC SensorTile.box" CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y diff --git a/samples/net/sockets/echo_server/overlay-netusb.conf b/samples/net/sockets/echo_server/overlay-netusb.conf index b39bdaac0f6..ca03d24a618 100644 --- a/samples/net/sockets/echo_server/overlay-netusb.conf +++ b/samples/net/sockets/echo_server/overlay-netusb.conf @@ -3,6 +3,7 @@ CONFIG_USB_DEVICE_STACK=y # Select USB Configurations CONFIG_USB_DEVICE_NETWORK_ECM=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n # Logging CONFIG_USB_DRIVER_LOG_LEVEL_INF=y diff --git a/samples/net/wpan_serial/prj.conf b/samples/net/wpan_serial/prj.conf index 13f972f46fb..7ad05d3e458 100644 --- a/samples/net/wpan_serial/prj.conf +++ b/samples/net/wpan_serial/prj.conf @@ -3,6 +3,7 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_NETWORKING=y diff --git a/samples/net/wpanusb/prj.conf b/samples/net/wpanusb/prj.conf index 380e93df810..0a44f737fa0 100644 --- a/samples/net/wpanusb/prj.conf +++ b/samples/net/wpanusb/prj.conf @@ -3,6 +3,7 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PID=0x000D CONFIG_USB_REQUEST_BUFFER_SIZE=300 CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/zperf/overlay-netusb.conf b/samples/net/zperf/overlay-netusb.conf index 5a13d20ed22..a85e73ea93a 100644 --- a/samples/net/zperf/overlay-netusb.conf +++ b/samples/net/zperf/overlay-netusb.conf @@ -3,3 +3,4 @@ CONFIG_USB_DEVICE_STACK=y # Select USB Configurations CONFIG_USB_DEVICE_NETWORK_ECM=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/sensor/fxos8700-hid/prj.conf b/samples/sensor/fxos8700-hid/prj.conf index e8940674b31..6650650f119 100644 --- a/samples/sensor/fxos8700-hid/prj.conf +++ b/samples/sensor/fxos8700-hid/prj.conf @@ -4,6 +4,7 @@ CONFIG_USB_DEVICE_HID=y CONFIG_USB_DEVICE_PRODUCT="Zephyr HID accelerometer mouse sample" CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_STDOUT_CONSOLE=y CONFIG_I2C=y diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-cdc.conf b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-cdc.conf index f55ed120362..259f4abb6fc 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/overlay-cdc.conf +++ b/samples/subsys/mgmt/mcumgr/smp_svr/overlay-cdc.conf @@ -2,5 +2,6 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_SERIAL=y CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n # USB backend is serial device CONFIG_MCUMGR_TRANSPORT_UART=y diff --git a/samples/subsys/modbus/rtu_server/overlay-cdc-acm.conf b/samples/subsys/modbus/rtu_server/overlay-cdc-acm.conf index a57cade1435..bc052b85118 100644 --- a/samples/subsys/modbus/rtu_server/overlay-cdc-acm.conf +++ b/samples/subsys/modbus/rtu_server/overlay-cdc-acm.conf @@ -1,3 +1,4 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM MODBUS sample" CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/subsys/shell/shell_module/overlay-usb.conf b/samples/subsys/shell/shell_module/overlay-usb.conf index e107d8b0268..60249a6e52c 100644 --- a/samples/subsys/shell/shell_module/overlay-usb.conf +++ b/samples/subsys/shell/shell_module/overlay-usb.conf @@ -3,3 +3,4 @@ CONFIG_USB_DEVICE_PRODUCT="Zephyr USB shell sample" CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/subsys/tracing/prj_usb.conf b/samples/subsys/tracing/prj_usb.conf index 50d88389759..e088645eaaf 100644 --- a/samples/subsys/tracing/prj_usb.conf +++ b/samples/subsys/tracing/prj_usb.conf @@ -1,6 +1,7 @@ CONFIG_GPIO=y CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_VID=0x2FE9 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_TRACING=y CONFIG_TRACING_TEST=y diff --git a/samples/subsys/tracing/prj_usb_ctf.conf b/samples/subsys/tracing/prj_usb_ctf.conf index c029168bfce..c4b51c0b6fe 100644 --- a/samples/subsys/tracing/prj_usb_ctf.conf +++ b/samples/subsys/tracing/prj_usb_ctf.conf @@ -1,6 +1,7 @@ CONFIG_GPIO=y CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_VID=0x2FE9 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_TRACING=y CONFIG_TRACING_CTF=y diff --git a/samples/subsys/usb/audio/headphones_microphone/prj.conf b/samples/subsys/usb/audio/headphones_microphone/prj.conf index a0ec1b30256..28f4b889fa1 100644 --- a/samples/subsys/usb/audio/headphones_microphone/prj.conf +++ b/samples/subsys/usb/audio/headphones_microphone/prj.conf @@ -3,6 +3,7 @@ CONFIG_STDOUT_CONSOLE=y #USB related configs CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr USB audio sample" +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n #LOG subsystem related configs CONFIG_LOG=y diff --git a/samples/subsys/usb/audio/headset/prj.conf b/samples/subsys/usb/audio/headset/prj.conf index a0ec1b30256..28f4b889fa1 100644 --- a/samples/subsys/usb/audio/headset/prj.conf +++ b/samples/subsys/usb/audio/headset/prj.conf @@ -3,6 +3,7 @@ CONFIG_STDOUT_CONSOLE=y #USB related configs CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr USB audio sample" +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n #LOG subsystem related configs CONFIG_LOG=y diff --git a/samples/subsys/usb/cdc_acm/prj.conf b/samples/subsys/usb/cdc_acm/prj.conf index 7614fbb1a43..55e4fe9217f 100644 --- a/samples/subsys/usb/cdc_acm/prj.conf +++ b/samples/subsys/usb/cdc_acm/prj.conf @@ -8,3 +8,4 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/subsys/usb/cdc_acm_composite/prj.conf b/samples/subsys/usb/cdc_acm_composite/prj.conf index 9a5fdc7f7b2..6b029f43a5e 100644 --- a/samples/subsys/usb/cdc_acm_composite/prj.conf +++ b/samples/subsys/usb/cdc_acm_composite/prj.conf @@ -9,6 +9,7 @@ CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM Composite sample" CONFIG_USB_DEVICE_PID=0x0002 CONFIG_USB_COMPOSITE_DEVICE=y CONFIG_USB_CDC_ACM_RINGBUF_SIZE=512 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y diff --git a/samples/subsys/usb/console/prj.conf b/samples/subsys/usb/console/prj.conf index 28103411fc3..61baa5ba45d 100644 --- a/samples/subsys/usb/console/prj.conf +++ b/samples/subsys/usb/console/prj.conf @@ -1,6 +1,7 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr USB console sample" CONFIG_USB_DEVICE_PID=0x0004 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_SERIAL=y CONFIG_CONSOLE=y diff --git a/samples/subsys/usb/dfu/prj.conf b/samples/subsys/usb/dfu/prj.conf index 113241ed163..e94e5db6907 100644 --- a/samples/subsys/usb/dfu/prj.conf +++ b/samples/subsys/usb/dfu/prj.conf @@ -12,3 +12,4 @@ CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_BOOTLOADER_MCUBOOT=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/subsys/usb/hid-cdc/prj.conf b/samples/subsys/usb/hid-cdc/prj.conf index 09b1d2d4984..cf274459fb5 100644 --- a/samples/subsys/usb/hid-cdc/prj.conf +++ b/samples/subsys/usb/hid-cdc/prj.conf @@ -2,6 +2,7 @@ CONFIG_USB_COMPOSITE_DEVICE=y CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr HID and CDC ACM sample" CONFIG_USB_DEVICE_PID=0x0003 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_ENTROPY_GENERATOR=y CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y diff --git a/samples/subsys/usb/hid-mouse/prj.conf b/samples/subsys/usb/hid-mouse/prj.conf index 9dcefd22bbf..3aadd5304c9 100644 --- a/samples/subsys/usb/hid-mouse/prj.conf +++ b/samples/subsys/usb/hid-mouse/prj.conf @@ -2,6 +2,7 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_HID=y CONFIG_USB_DEVICE_PRODUCT="Zephyr HID mouse sample" CONFIG_USB_DEVICE_PID=0x0007 +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y diff --git a/samples/subsys/usb/hid/prj.conf b/samples/subsys/usb/hid/prj.conf index bb013f237e1..51d31e1439f 100644 --- a/samples/subsys/usb/hid/prj.conf +++ b/samples/subsys/usb/hid/prj.conf @@ -3,6 +3,7 @@ CONFIG_USB_DEVICE_HID=y CONFIG_USB_DEVICE_PRODUCT="Zephyr HID sample" CONFIG_USB_DEVICE_PID=0x0006 CONFIG_USB_HID_BOOT_PROTOCOL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y diff --git a/samples/subsys/usb/mass/prj.conf b/samples/subsys/usb/mass/prj.conf index 6718a88e1ce..0954afcd0ee 100644 --- a/samples/subsys/usb/mass/prj.conf +++ b/samples/subsys/usb/mass/prj.conf @@ -9,5 +9,6 @@ CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y CONFIG_USB_MASS_STORAGE=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_MAIN_STACK_SIZE=1536 diff --git a/samples/subsys/usb/testusb/prj.conf b/samples/subsys/usb/testusb/prj.conf index 1df44439ea8..e310a67818d 100644 --- a/samples/subsys/usb/testusb/prj.conf +++ b/samples/subsys/usb/testusb/prj.conf @@ -8,3 +8,4 @@ CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOOPBACK=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n diff --git a/samples/subsys/usb/webusb/prj.conf b/samples/subsys/usb/webusb/prj.conf index f4729561c76..0f706e42dde 100644 --- a/samples/subsys/usb/webusb/prj.conf +++ b/samples/subsys/usb/webusb/prj.conf @@ -6,6 +6,7 @@ CONFIG_USB_DEVICE_PRODUCT="Zephyr WebUSB sample" CONFIG_USB_DEVICE_PID=0x000A CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n CONFIG_LOG=y CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y