OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

zephyr: remove Kconfig option CONFIG_USB 

USB device support configuration is revised,
CONFIG_USB option is deprecated.
Only USB_DEVICE_STACK option should be used to
enable USB device support.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-08-02 13:20:09 +02:00 committed by David Brown
parent 01184bd036
commit 25852971db
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/zephyr/Kconfig
View File

@ -355,7 +355,7 @@ config BOOT_USB_DFU_NO
config BOOT_USB_DFU_WAIT config BOOT_USB_DFU_WAIT
bool "Wait for a prescribed duration to see if USB DFU is invoked" bool "Wait for a prescribed duration to see if USB DFU is invoked"
select USB select USB_DEVICE_STACK
select USB_DFU_CLASS select USB_DFU_CLASS
select IMG_MANAGER select IMG_MANAGER
help help
@ -365,7 +365,7 @@ config BOOT_USB_DFU_WAIT
config BOOT_USB_DFU_GPIO config BOOT_USB_DFU_GPIO
bool "Use GPIO to detect whether to trigger DFU mode" bool "Use GPIO to detect whether to trigger DFU mode"
select USB select USB_DEVICE_STACK
select USB_DFU_CLASS select USB_DFU_CLASS
select IMG_MANAGER select IMG_MANAGER
help help
@ -478,7 +478,6 @@ config BOOT_SERIAL_UART
config BOOT_SERIAL_CDC_ACM config BOOT_SERIAL_CDC_ACM
bool "CDC ACM" bool "CDC ACM"
select USB
select USB_DEVICE_STACK select USB_DEVICE_STACK
select USB_CDC_ACM select USB_CDC_ACM

1
boot/zephyr/boards/nrf52840dongle_nrf52840.conf
View File

@ -24,7 +24,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=6
CONFIG_MULTITHREADING=y CONFIG_MULTITHREADING=y
# USB # USB
CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="MCUBOOT" CONFIG_USB_DEVICE_PRODUCT="MCUBOOT"
CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM=y