zephyr: Use CONFIG_USB_DEVICE_STACK for conditional USB device support.

CONFIG_USB was removed in Zephyr v2.7.0 after some Kconfig rework that made it sufficient to use CONFIG_USB_DEVICE_STACK only. Signed-off-by: Maureen Helm <maureen.helm@intel.com>
micropython · Jan 6, 2022 · 0cf03bd · 0cf03bd
1 parent 1e5df09
commit 0cf03bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ports/zephyr/boards/mimxrt1050_evk.conf b/ports/zephyr/boards/mimxrt1050_evk.conf
@@ -1,7 +1,6 @@
 # Required for zephyr.DiskAccess block devices
 CONFIG_DISK_ACCESS=y
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
 CONFIG_USB_MASS_STORAGE=y

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
@@ -34,7 +34,7 @@
 #include <net/net_context.h>
 #endif
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 #include <usb/usb_device.h>
 #endif
 
@@ -140,7 +140,7 @@ int real_main(void) {
     #endif
     mp_init();
 
-    #ifdef CONFIG_USB
+    #ifdef CONFIG_USB_DEVICE_STACK
     usb_enable(NULL);
     #endif