Skip to content

Commit 274363a

Browse files
committed
boards: clean up CDC ACM configuration for nRF52840 based boards
Remove CDC ACM UART devicetree nodes, chosen properties and explicit USB support configuration in favor of generic CDC ACM shield. For console support via USB CDC ACM, in-tree samples for this boards is to be built as follows: west build -b nrf52840dongle_nrf52840 samples/basic/threads -- -DSHIELD=cdc_acm_console For shell support via USB CDC ACM, in-tree samples for this boards is to be built as follows: west build -b nrf52840dongle_nrf52840 samples/subsys/shell/shell_module -- -DSHIELD=cdc_acm_shell Signed-off-by: Johann Fischer <[email protected]>
1 parent 7492510 commit 274363a

File tree

4 files changed

+2
-30
lines changed

4 files changed

+2
-30
lines changed

boards/arm/degu_evk/Kconfig.defconfig

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,6 @@ if BOARD_DEGU_EVK
88
config BOARD
99
default "degu_evk"
1010

11-
if USB_DEVICE_STACK
12-
13-
config USB_DEVICE_PRODUCT
14-
default "Degu Evaluation Kit"
15-
16-
config UART_INTERRUPT_DRIVEN
17-
default y
18-
19-
config UART_LINE_CTRL
20-
default y
21-
22-
endif # USB_DEVICE_STACK
23-
2411
if DISK_DRIVER_FLASH
2512

2613
config DISK_FLASH_DEV_NAME

boards/arm/degu_evk/degu_evk.dts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
chosen {
1616
zephyr,sram = &sram0;
1717
zephyr,flash = &flash0;
18-
zephyr,console = &degu_cdc_acm_uart;
19-
zephyr,shell-uart = &degu_cdc_acm_uart;
18+
zephyr,console = &uart0;
19+
zephyr,shell-uart = &uart0;
2020
zephyr,code-partition = &slot0_partition;
2121
zephyr,ieee802154 = &ieee802154;
2222
};
@@ -161,8 +161,4 @@
161161
zephyr_udc0: &usbd {
162162
compatible = "nordic,nrf-usbd";
163163
status = "okay";
164-
165-
degu_cdc_acm_uart: degu_cdc_acm_uart {
166-
compatible = "zephyr,cdc-acm-uart";
167-
};
168164
};

boards/arm/degu_evk/degu_evk_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ CONFIG_SERIAL=y
1212
CONFIG_CONSOLE=y
1313
CONFIG_UART_CONSOLE=y
1414

15-
# enable USB (for CDC ACM console)
16-
CONFIG_USB_DEVICE_STACK=y
17-
1815
# additional board options
1916
CONFIG_GPIO=y
2017
CONFIG_GPIO_AS_PINRESET=y

boards/arm/nrf52840dongle_nrf52840/Kconfig.defconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ config FLASH_LOAD_OFFSET
2424
default 0x1000
2525
depends on BOARD_HAS_NRF5_BOOTLOADER && !USE_DT_CODE_PARTITION
2626

27-
if USB_DEVICE_STACK
28-
29-
# Enable UART driver, needed for CDC ACM
30-
config SERIAL
31-
default y
32-
33-
endif # USB_DEVICE_STACK
34-
3527
config BT_CTLR
3628
default BT
3729

0 commit comments

Comments
 (0)