michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: remove USB option for nRF based boards

Browse source 
It is enough to set the USB_DEVICE_STACK option to enable
USB device support. Also the option USB_NRFX is not necessary
here because it is selected in drivers/usb/device/Kconfig anyway.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-06-30 14:05:27 +02:00 • committed by Anas Nashif
commit 9512ae488a
30 changed files with 6 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

10
boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_ADAFRUIT_FEATHER_NRF52840
config BOARD config BOARD
default "adafruit_feather_nrf52840" default "adafruit_feather_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

2
boards/arm/arduino_nano_33_ble/Kconfig.board
View file

@ -9,7 +9,7 @@ config BOARD_ARDUINO_NANO_33_BLE_EN_USB_CONSOLE
bool "Sends the console output over the USB port" bool "Sends the console output over the USB port"
depends on BOARD_ARDUINO_NANO_33_BLE depends on BOARD_ARDUINO_NANO_33_BLE
select SERIAL select SERIAL
select USB select USB_DEVICE_STACK
select CONSOLE select CONSOLE
select PRINTK select PRINTK
select UART_INTERRUPT_DRIVEN select UART_INTERRUPT_DRIVEN

7
boards/arm/arduino_nano_33_ble/Kconfig.defconfig
View file

@ -5,13 +5,6 @@ if BOARD_ARDUINO_NANO_33_BLE
config BOARD config BOARD
default "arduino_nano_33_ble" default "arduino_nano_33_ble"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/bl5340_dvk/Kconfig.defconfig
View file

@ -87,16 +87,6 @@ config FLASH_LOAD_SIZE
endif # BOARD_BL5340_DVK_CPUAPP_NS endif # BOARD_BL5340_DVK_CPUAPP_NS
if (BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS) && USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # (BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS) && USB
# Workaround for not being able to have commas in macro arguments # Workaround for not being able to have commas in macro arguments
DT_COMPAT_TI_TCA9538 := ti,tca9538 DT_COMPAT_TI_TCA9538 := ti,tca9538

10
boards/arm/bl653_dvk/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_BL653_DVK
config BOARD config BOARD
default "bl653_dvk" default "bl653_dvk"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config IEEE802154_NRF5 config IEEE802154_NRF5
default y default y
depends on IEEE802154 depends on IEEE802154

10
boards/arm/bl654_dvk/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_BL654_DVK
config BOARD config BOARD
default "bl654_dvk" default "bl654_dvk"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/contextualelectronics_abc/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_CONTEXTELEC_ABC
config BOARD config BOARD
default "nrf52840_ble_cell" default "nrf52840_ble_cell"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/degu_evk/Kconfig.defconfig
View file

@ -8,13 +8,7 @@ if BOARD_DEGU_EVK
config BOARD config BOARD
default "degu_evk" default "degu_evk"
if USB if USB_DEVICE_STACK
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
config USB_DEVICE_PRODUCT config USB_DEVICE_PRODUCT
default "Degu Evaluation Kit" default "Degu Evaluation Kit"
@ -34,7 +28,7 @@ config UART_CONSOLE_ON_DEV_NAME
config UART_SHELL_ON_DEV_NAME config UART_SHELL_ON_DEV_NAME
default "CDC_ACM_0" default "CDC_ACM_0"
endif # USB endif # USB_DEVICE_STACK
if DISK_DRIVER_FLASH if DISK_DRIVER_FLASH

10
boards/arm/nrf21540dk_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF21540DK_NRF52840
config BOARD config BOARD
default "nrf21540dk_nrf52840" default "nrf21540dk_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
# Disabled until PA/LNA support for nRF21540 front-end is added # Disabled until PA/LNA support for nRF21540 front-end is added
# in Zephyr Bluetooth Controller # in Zephyr Bluetooth Controller

10
boards/arm/nrf52833dk_nrf52820/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52833DK_NRF52820
config BOARD config BOARD
default "nrf52833dk_nrf52820" default "nrf52833dk_nrf52820"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52833dk_nrf52833/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52833DK_NRF52833
config BOARD config BOARD
default "nrf52833dk_nrf52833" default "nrf52833dk_nrf52833"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52840_blip/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52840_BLIP
config BOARD config BOARD
default "nrf52840_blip" default "nrf52840_blip"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52840_mdk/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52840_MDK
config BOARD config BOARD
default "nrf52840_mdk" default "nrf52840_mdk"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52840_papyr/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52840_PAPYR
config BOARD config BOARD
default "nrf52840_papyr" default "nrf52840_papyr"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52840dk_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_NRF52840DK_NRF52840
config BOARD config BOARD
default "nrf52840dk_nrf52840" default "nrf52840dk_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig
View file

@ -24,13 +24,7 @@ config FLASH_LOAD_OFFSET
default 0x1000 default 0x1000
depends on BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION depends on BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION
if USB if USB_DEVICE_STACK
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
# Enable UART driver, needed for CDC ACM # Enable UART driver, needed for CDC ACM
config SERIAL config SERIAL
@ -39,7 +33,7 @@ config SERIAL
config UART_INTERRUPT_DRIVEN config UART_INTERRUPT_DRIVEN
default USB_CDC_ACM default USB_CDC_ACM
endif # USB endif # USB_DEVICE_STACK
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig
View file

@ -73,16 +73,6 @@ config FLASH_LOAD_SIZE
endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS
if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) && USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS) && USB
endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
config BOARD config BOARD

10
boards/arm/particle_argon/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_PARTICLE_ARGON
config BOARD config BOARD
default "particle_argon" default "particle_argon"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/particle_boron/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_PARTICLE_BORON
config BOARD config BOARD
default "particle_boron" default "particle_boron"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/particle_xenon/Kconfig.defconfig
View file

@ -9,16 +9,6 @@ if BOARD_PARTICLE_XENON
config BOARD config BOARD
default "particle_xenon" default "particle_xenon"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/pinnacle_100_dvk/Kconfig.defconfig
View file

@ -11,16 +11,6 @@ config BOARD
config MODEM_HL7800 config MODEM_HL7800
default NETWORKING default NETWORKING
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config IEEE802154_NRF5 config IEEE802154_NRF5
default y default y
depends on IEEE802154 depends on IEEE802154

10
boards/arm/rak4631_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_RAK4631_NRF52840
config BOARD config BOARD
default "rak4631_nrf52840" default "rak4631_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/rak5010_nrf52840/Kconfig.defconfig
View file

@ -11,16 +11,6 @@ config BOARD
config MODEM_QUECTEL_BG9X config MODEM_QUECTEL_BG9X
default y default y
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/reel_board/Kconfig.defconfig
View file

@ -12,16 +12,6 @@ config BOARD
config I2C config I2C
default y default y
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default y default y
depends on BT depends on BT

8
boards/arm/thingy53_nrf5340/Kconfig.defconfig
View file

@ -68,14 +68,8 @@ config HEAP_MEM_POOL_SIZE
config BT_HAS_HCI_VS config BT_HAS_HCI_VS
default BT default BT
config USB_NRFX
default USB
config USB_DEVICE_STACK
default USB
config USB_NRFX_ATTACHED_EVENT_DELAY config USB_NRFX_ATTACHED_EVENT_DELAY
default 700 if USB default 700 if USB_DEVICE_DRIVER
config I2C config I2C
default y default y

10
boards/arm/ubx_bmd340eval_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_UBX_BMD340EVAL_NRF52840
config BOARD config BOARD
default "ubx_bmd340eval_nrf52840" default "ubx_bmd340eval_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/ubx_bmd345eval_nrf52840/Kconfig.defconfig
View file

@ -9,16 +9,6 @@ if BOARD_UBX_BMD345EVAL_NRF52840
config BOARD config BOARD
default "ubx_bmd345eval_nrf52840" default "ubx_bmd345eval_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT

10
boards/arm/ubx_bmd380eval_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_UBX_BMD380EVAL_NRF52840
config BOARD config BOARD
default "ubx_bmd380eval_nrf52840" default "ubx_bmd380eval_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config IEEE802154_NRF5 config IEEE802154_NRF5
default y default y
depends on IEEE802154 depends on IEEE802154

10
boards/arm/ubx_evkninab3_nrf52840/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_UBX_EVKNINAB3_NRF52840
config BOARD config BOARD
default "ubx_evkninab3_nrf52840" default "ubx_evkninab3_nrf52840"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config IEEE802154_NRF5 config IEEE802154_NRF5
default y default y
depends on IEEE802154 depends on IEEE802154

10
boards/arm/ubx_evkninab4_nrf52833/Kconfig.defconfig
View file

@ -8,16 +8,6 @@ if BOARD_UBX_EVKNINAB4_NRF52833
config BOARD config BOARD
default "ubx_evkninab4_nrf52833" default "ubx_evkninab4_nrf52833"
if USB
config USB_NRFX
default y
config USB_DEVICE_STACK
default y
endif # USB
config BT_CTLR config BT_CTLR
default BT default BT