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 <jamie.mccrae@nordicsemi.no>
2022-12-19 14:14:45 +00:00
parent f09111a2a9
commit 11c7371f99
26 changed files with 26 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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