TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

zephyr: Use CONFIG_USB_DEVICE_STACK for conditional USB device support.

Browse Source 
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>
This commit is contained in:
Maureen Helm
2022-01-04 16:58:42 -06:00
committed by Damien George
parent 1e5df0982a
commit 0cf03bd3b1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ports/zephyr/boards/mimxrt1050_evk.conf
View File

@@ -1,7 +1,6 @@
# Required for zephyr.DiskAccess block devices # Required for zephyr.DiskAccess block devices
CONFIG_DISK_ACCESS=y CONFIG_DISK_ACCESS=y
CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython" CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
CONFIG_USB_MASS_STORAGE=y CONFIG_USB_MASS_STORAGE=y

4
ports/zephyr/main.c
View File

@@ -34,7 +34,7 @@
#include <net/net_context.h> #include <net/net_context.h>
#endif #endif
#ifdef CONFIG_USB #ifdef CONFIG_USB_DEVICE_STACK
#include <usb/usb_device.h> #include <usb/usb_device.h>
#endif #endif
@@ -140,7 +140,7 @@ soft_reset:
#endif #endif
mp_init(); mp_init();
#ifdef CONFIG_USB #ifdef CONFIG_USB_DEVICE_STACK
usb_enable(NULL); usb_enable(NULL);
#endif #endif