samples: Bluetooth: hci_usb: Disable USB_CDC_ACM

BlueZ btusb does not recognize hci_usb sample as Bluetooth Controller when CDC ACM is enabled in the sample. Refer to zephyrproject-rtos/zephyr#29107 (cherry picked from commit 5eb17bc) Original-Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> GitOrigin-RevId: 5eb17bc Change-Id: I9bace9d51ad11f72d783fd8aab9787da069a1ad1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4604582 Reviewed-by: Fabio Baltieri <[email protected]> Commit-Queue: Fabio Baltieri <[email protected]> Tested-by: CopyBot Service Account <[email protected]> Tested-by: Fabio Baltieri <[email protected]>
coreboot · Jun 12, 2023 · 755291b · 755291b
1 parent 0359cdd
commit 755291b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/boards/arm/adafruit_itsybitsy_nrf52840/Kconfig.defconfig b/boards/arm/adafruit_itsybitsy_nrf52840/Kconfig.defconfig
@@ -17,13 +17,13 @@ config USB_DEVICE_STACK
 	default y
 
 config USB_CDC_ACM
-	default y
+	default SERIAL
 
 config UART_CONSOLE
 	default CONSOLE
 
 config USB_DEVICE_INITIALIZE_AT_BOOT
-	default y
+	default y if CONSOLE
 
 config SHELL_BACKEND_SERIAL_CHECK_DTR
 	default SHELL

diff --git a/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig b/boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig
@@ -31,13 +31,13 @@ config USB_DEVICE_STACK
 	default y
 
 config USB_CDC_ACM
-	default y
+	default SERIAL
 
 config UART_CONSOLE
 	default CONSOLE
 
 config USB_DEVICE_INITIALIZE_AT_BOOT
-	default y if !MCUBOOT
+	default y if !MCUBOOT && CONSOLE
 
 config SHELL_BACKEND_SERIAL_CHECK_DTR
 	default SHELL

diff --git a/samples/bluetooth/hci_usb/prj.conf b/samples/bluetooth/hci_usb/prj.conf
@@ -1,16 +1,16 @@
-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
 
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PID=0x000B
 CONFIG_USB_DEVICE_BLUETOOTH=y
 CONFIG_USB_DEVICE_BLUETOOTH_VS_H4=n
+CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+
+# We dont want any console or CDC ACM that may cause BlueZ to not detect hci_usb
+CONFIG_SERIAL=n
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
 
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
 # Host number of completed commands does not follow normal flow control.