michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: nrf: Remove flow control configuration from kconfig

Browse source 
Removed flow control configuration from Kconfig and updated samples
to use device tree for that.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2020-06-05 15:27:03 +02:00 • committed by Carles Cufí
commit 43cad10f73
22 changed files with 9 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather_defconfig
View file

@ -12,7 +12,6 @@ CONFIG_GPIO=y
# enable uart driver # enable uart driver
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_UART_0_NRF_FLOW_CONTROL=n
# enable console # enable console
CONFIG_CONSOLE=y CONFIG_CONSOLE=y

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

@ -27,9 +27,6 @@ config BT_CTLR
if MODEM if MODEM
config UART_1_NRF_FLOW_CONTROL
default y
config MODEM_UBLOX_SARA config MODEM_UBLOX_SARA
default y default y

1
boards/arm/particle_boron/particle_boron.dts
View file

@ -40,6 +40,7 @@
rx-pin = <36>; rx-pin = <36>;
rts-pin = <39>; rts-pin = <39>;
cts-pin = <38>; cts-pin = <38>;
hw-flow-control;
sara_r4 { sara_r4 {
compatible = "ublox,sara-r4"; compatible = "ublox,sara-r4";

3
boards/shields/wnc_m14a2a/boards/nrf52840dk_nrf52840.defconfig
View file

@ -6,7 +6,4 @@ if BOARD_NRF52840DK_NRF52840
config GPIO_NRF_P1 config GPIO_NRF_P1
default y default y
config UART_1_NRF_FLOW_CONTROL
default y
endif # BOARD_NRF52840DK_NRF52840 endif # BOARD_NRF52840DK_NRF52840

24
drivers/serial/Kconfig.nrfx
View file

@ -55,12 +55,6 @@ config UART_0_NRF_PARITY_BIT
help help
Enable parity bit. Enable parity bit.
config UART_0_NRF_FLOW_CONTROL
bool "Enable flow control"
help
Enable flow control. If selected, additionally two pins, RTS and CTS
have to be configured.
config UART_0_NRF_TX_BUFFER_SIZE config UART_0_NRF_TX_BUFFER_SIZE
int "Size of RAM buffer" int "Size of RAM buffer"
depends on UART_0_NRF_UARTE depends on UART_0_NRF_UARTE
@ -124,12 +118,6 @@ config UART_1_NRF_PARITY_BIT
help help
Enable parity bit. Enable parity bit.
config UART_1_NRF_FLOW_CONTROL
bool "Enable flow control"
help
Enable flow control. If selected, additionally two pins, RTS and CTS
have to be configured.
config UART_1_NRF_TX_BUFFER_SIZE config UART_1_NRF_TX_BUFFER_SIZE
int "Size of RAM buffer" int "Size of RAM buffer"
depends on UART_INTERRUPT_DRIVEN depends on UART_INTERRUPT_DRIVEN
@ -192,12 +180,6 @@ config UART_2_NRF_PARITY_BIT
help help
Enable parity bit. Enable parity bit.
config UART_2_NRF_FLOW_CONTROL
bool "Enable flow control"
help
Enable flow control. If selected, additionally two pins, RTS and CTS
have to be configured.
config UART_2_NRF_TX_BUFFER_SIZE config UART_2_NRF_TX_BUFFER_SIZE
int "Size of RAM buffer" int "Size of RAM buffer"
range 1 65535 range 1 65535
@ -259,12 +241,6 @@ config UART_3_NRF_PARITY_BIT
help help
Enable parity bit. Enable parity bit.
config UART_3_NRF_FLOW_CONTROL
bool "Enable flow control"
help
Enable flow control. If selected, additionally two pins, RTS and CTS
have to be configured.
config UART_3_NRF_TX_BUFFER_SIZE config UART_3_NRF_TX_BUFFER_SIZE
int "Size of RAM buffer" int "Size of RAM buffer"
range 1 65535 range 1 65535

1
samples/bluetooth/hci_uart/boards/96b_nitrogen.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/96b_nitrogen.overlay
View file

@ -3,5 +3,6 @@
&uart0 { &uart0 {
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
hw-flow-control;
status = "okay"; status = "okay";
}; };

1
samples/bluetooth/hci_uart/boards/bbc_microbit.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=n
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_IDLE_STACK_SIZE=256 CONFIG_IDLE_STACK_SIZE=256
CONFIG_ISR_STACK_SIZE=512 CONFIG_ISR_STACK_SIZE=512

1
samples/bluetooth/hci_uart/boards/nrf51_blenano.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/nrf51_blenano.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf51dk_nrf51422.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=512 CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/nrf51dk_nrf51422.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf52840dk_nrf52840.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/nrf52840dk_nrf52840.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf52_blenano2.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/nrf52_blenano2.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

1
samples/bluetooth/hci_uart/boards/nrf52dk_nrf52832.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uart"; compatible = "nordic,nrf-uart";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf5340pdk_nrf5340_cpuapp.overlay
View file

@ -4,4 +4,5 @@
compatible = "nordic,nrf-uarte"; compatible = "nordic,nrf-uarte";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
}; };

1
samples/bluetooth/hci_uart/boards/nrf53_dk_nrf5340_cpuapp.conf
View file

@ -1,5 +1,4 @@
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_UART_0_NRF_FLOW_CONTROL=y
CONFIG_MAIN_STACK_SIZE=1024 CONFIG_MAIN_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
CONFIG_BT_MAX_CONN=16 CONFIG_BT_MAX_CONN=16

3
samples/bluetooth/hci_uart/boards/nrf9160dk_nrf52840.conf
View file

@ -20,6 +20,3 @@ CONFIG_BOARD_NRF9160DK_INTERFACE1_MCU=y
# Enable reset pin on P1.02 # Enable reset pin on P1.02
CONFIG_BOARD_NRF9160DK_NRF52840_RESET=y CONFIG_BOARD_NRF9160DK_NRF52840_RESET=y
CONFIG_BOARD_NRF9160DK_NRF52840_RESET_P1_02=y CONFIG_BOARD_NRF9160DK_NRF52840_RESET_P1_02=y
# Use UART1 for HCI
CONFIG_UART_1_NRF_FLOW_CONTROL=y

1
samples/bluetooth/hci_uart/boards/nrf9160dk_nrf52840.overlay
View file

@ -10,6 +10,7 @@
compatible = "nordic,nrf-uarte"; compatible = "nordic,nrf-uarte";
current-speed = <1000000>; current-speed = <1000000>;
status = "okay"; status = "okay";
hw-flow-control;
tx-pin = <17>; tx-pin = <17>;
rx-pin = <20>; rx-pin = <20>;
rts-pin = <15>; rts-pin = <15>;