tests: remove USB configuration option

Remove USB configuration option, replace it where necessary with USB_DEVICE_STACK. Signed-off-by: Johann Fischer <[email protected]>
yegorich · Aug 3, 2021 · 3240e0c · 3240e0c
1 parent 946964e
commit 3240e0c
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 8 deletions.
diff --git a/tests/bluetooth/shell/cdc_acm.conf b/tests/bluetooth/shell/cdc_acm.conf
@@ -1,4 +1,3 @@
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr BT Shell"
 CONFIG_USB_UART_CONSOLE=y

diff --git a/tests/boards/intel_s1000_crb/cache/prj.conf b/tests/boards/intel_s1000_crb/cache/prj.conf
@@ -1,2 +1,2 @@
 CONFIG_LOG=y
-CONFIG_USB=n
+CONFIG_USB_DEVICE_STACK=n
diff --git a/tests/boards/intel_s1000_crb/main/CMakeLists.txt b/tests/boards/intel_s1000_crb/main/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 if(CONFIG_I2S)
 target_sources(app PRIVATE src/i2s_test.c)
 endif()
-if(CONFIG_USB)
+if(CONFIG_USB_DEVICE_STACK)
 target_sources(app PRIVATE src/test_hid.c)
 endif()
 if(CONFIG_SPI)

diff --git a/tests/kernel/threads/no-multithreading/prj.conf b/tests/kernel/threads/no-multithreading/prj.conf
@@ -1,7 +1,7 @@
 CONFIG_ZTEST=y
 CONFIG_MULTITHREADING=n
 CONFIG_BT=n
-CONFIG_USB=n
+CONFIG_USB_DEVICE_STACK=n
 CONFIG_NETWORKING=n
 CONFIG_ASSERT=n
 CONFIG_SPIN_VALIDATE=n
diff --git a/tests/subsys/usb/bos/prj.conf b/tests/subsys/usb/bos/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_BOS=y
diff --git a/tests/subsys/usb/desc_sections/prj.conf b/tests/subsys/usb/desc_sections/prj.conf
@@ -1,5 +1,4 @@
 CONFIG_ZTEST=y
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_COMPOSITE_DEVICE=n
 CONFIG_USB_DEVICE_LOG_LEVEL_DBG=y

diff --git a/tests/subsys/usb/device/prj.conf b/tests/subsys/usb/device/prj.conf
@@ -4,5 +4,4 @@ CONFIG_LOG=y
 CONFIG_USB_DEVICE_LOG_LEVEL_DBG=y
 CONFIG_USB_DRIVER_LOG_LEVEL_DBG=y
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
diff --git a/tests/subsys/usb/os_desc/prj.conf b/tests/subsys/usb/os_desc/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_OS_DESC=y