treewide: Align with upstream USB changes

rlubos · rlubos · commit ef595b0cf658 · 2021-11-09T12:30:05.000+01:00
CONFIG_USB has been delated, one can use CONFIG_USB_DEVICE_STACK to
enable USB stack instead.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/applications/connectivity_bridge/prj.conf b/applications/connectivity_bridge/prj.conf
@@ -17,7 +17,6 @@ CONFIG_BRIDGE_MSC_ENABLE=y
 CONFIG_BRIDGE_BLE_ENABLE=y
 
  # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_PRODUCT="Thingy:91 UART"
diff --git a/applications/connectivity_bridge/src/modules/Kconfig b/applications/connectivity_bridge/src/modules/Kconfig
@@ -10,7 +10,7 @@ source "subsys/logging/Kconfig.template.log_config"
 
 config BRIDGE_CDC_ENABLE
 	bool "Enable USB CDC ACM"
-	depends on USB
+	depends on USB_DEVICE_STACK
 	select USB_CDC_ACM
 	help
 		This option enables USB CDC ACM
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
@@ -154,7 +154,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
@@ -154,7 +154,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/machine_learning/src/modules/Kconfig.usb_state b/applications/machine_learning/src/modules/Kconfig.usb_state
@@ -6,7 +6,7 @@
 
 menuconfig ML_APP_USB_STATE
 	bool "USB module"
-	depends on USB
+	depends on USB_DEVICE_STACK
 	depends on CAF_POWER_MANAGER
 	select CAF_FORCE_POWER_DOWN_EVENTS
 	help
diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf
@@ -109,7 +109,6 @@ CONFIG_SHELL=y
 CONFIG_SHELL_LOG_BACKEND=n
 
 # Enable USB CDC ACM
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/matter_weather_station/src/main.cpp b/applications/matter_weather_station/src/main.cpp
@@ -8,7 +8,7 @@
 
 #include <logging/log.h>
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 #include <usb/usb_device.h>
 #endif
 
@@ -25,7 +25,7 @@ int main()
 	int ret = 0;
 	CHIP_ERROR err = CHIP_NO_ERROR;
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 	err = chip::System::MapErrorZephyr(usb_enable(NULL));
 	if (err != CHIP_NO_ERROR) {
 		goto exit;
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf
@@ -94,7 +94,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf
@@ -93,7 +93,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf
@@ -93,7 +93,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=17
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf
@@ -99,7 +99,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf
@@ -96,7 +96,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf
@@ -97,7 +97,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf
@@ -97,7 +97,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf
@@ -95,7 +95,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf
@@ -95,7 +95,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=10
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=10
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf
@@ -108,7 +108,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf
@@ -105,7 +105,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf
@@ -110,7 +110,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf
@@ -101,7 +101,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf
@@ -105,7 +105,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf
@@ -102,7 +102,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf
@@ -109,7 +109,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf
@@ -152,7 +152,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf
@@ -153,7 +153,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf
@@ -161,7 +161,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf
@@ -152,7 +152,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf
@@ -147,7 +147,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf
@@ -148,7 +148,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf
@@ -101,7 +101,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf
@@ -98,7 +98,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf
@@ -99,7 +99,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/doc/ble_qos.rst b/applications/nrf_desktop/doc/ble_qos.rst
diff --git a/applications/nrf_desktop/src/modules/Kconfig.ble b/applications/nrf_desktop/src/modules/Kconfig.ble
diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c
diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf
diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf
diff --git a/samples/bluetooth/peripheral_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c
diff --git a/samples/openthread/cli/overlay-usb.conf b/samples/openthread/cli/overlay-usb.conf
diff --git a/samples/openthread/coprocessor/overlay-usb.conf b/samples/openthread/coprocessor/overlay-usb.conf
diff --git a/samples/zigbee/ncp/prj_usb.conf b/samples/zigbee/ncp/prj_usb.conf
diff --git a/samples/zigbee/ncp/src/main.c b/samples/zigbee/ncp/src/main.c
diff --git a/subsys/zigbee/Kconfig b/subsys/zigbee/Kconfig
diff --git a/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
