kopia lustrzana https://github.com/micropython/micropython
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>pull/8141/head
rodzic
1e5df0982a
commit
0cf03bd3b1
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue