diff --git a/boards/96b_nitrogen/96b_nitrogen_defconfig b/boards/96b_nitrogen/96b_nitrogen_defconfig index 1499f58f530..3691a964510 100644 --- a/boards/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/96b_nitrogen/96b_nitrogen_defconfig @@ -11,8 +11,6 @@ CONFIG_XIP=y # enable uart driver CONFIG_SERIAL=y CONFIG_UART_NRF5=y -CONFIG_UART_NRF5_GPIO_TX_PIN=13 -CONFIG_UART_NRF5_GPIO_RX_PIN=15 # enable console CONFIG_CONSOLE=y diff --git a/boards/96b_nitrogen/Kconfig.defconfig b/boards/96b_nitrogen/Kconfig.defconfig index 562473e7854..a4397822a58 100644 --- a/boards/96b_nitrogen/Kconfig.defconfig +++ b/boards/96b_nitrogen/Kconfig.defconfig @@ -30,6 +30,18 @@ config GPIO_NRF5 config GPIO_NRF5_P0 default y +config UART_NRF5_GPIO_TX_PIN + default 13 + +config UART_NRF5_GPIO_RX_PIN + default 15 + +config UART_NRF5_GPIO_RTS_PIN + default 12 + +config UART_NRF5_GPIO_CTS_PIN + default 14 + endif # UART_NRF5 endif # BOARD_96B_NITROGEN diff --git a/boards/nrf51_pca10028/Kconfig.defconfig b/boards/nrf51_pca10028/Kconfig.defconfig index 19b9c2d450d..54f7c2854cc 100644 --- a/boards/nrf51_pca10028/Kconfig.defconfig +++ b/boards/nrf51_pca10028/Kconfig.defconfig @@ -30,6 +30,18 @@ config GPIO_NRF5 config GPIO_NRF5_P0 default y +config UART_NRF5_GPIO_TX_PIN + default 9 + +config UART_NRF5_GPIO_RX_PIN + default 11 + +config UART_NRF5_GPIO_RTS_PIN + default 8 + +config UART_NRF5_GPIO_CTS_PIN + default 10 + endif # UART_NRF5 endif # BOARD_NRF51_PCA10028 diff --git a/boards/nrf51_pca10028/nrf51_pca10028_defconfig b/boards/nrf51_pca10028/nrf51_pca10028_defconfig index f56a7478533..147a800f298 100644 --- a/boards/nrf51_pca10028/nrf51_pca10028_defconfig +++ b/boards/nrf51_pca10028/nrf51_pca10028_defconfig @@ -7,8 +7,6 @@ CONFIG_BOARD_NRF51_PCA10028=y # enable uart driver CONFIG_SERIAL=y CONFIG_UART_NRF5=y -CONFIG_UART_NRF5_GPIO_TX_PIN=9 -CONFIG_UART_NRF5_GPIO_RX_PIN=11 # enable console CONFIG_CONSOLE=y diff --git a/boards/nrf52_pca10040/Kconfig.defconfig b/boards/nrf52_pca10040/Kconfig.defconfig index 01270f7cb7b..602e0ede312 100644 --- a/boards/nrf52_pca10040/Kconfig.defconfig +++ b/boards/nrf52_pca10040/Kconfig.defconfig @@ -30,6 +30,18 @@ config GPIO_NRF5 config GPIO_NRF5_P0 default y +config UART_NRF5_GPIO_TX_PIN + default 6 + +config UART_NRF5_GPIO_RX_PIN + default 8 + +config UART_NRF5_GPIO_RTS_PIN + default 5 + +config UART_NRF5_GPIO_CTS_PIN + default 7 + endif # UART_NRF5 endif # BOARD_NRF52_PCA10040 diff --git a/drivers/serial/Kconfig.nrf5 b/drivers/serial/Kconfig.nrf5 index d6e1007f161..860d0bd859d 100644 --- a/drivers/serial/Kconfig.nrf5 +++ b/drivers/serial/Kconfig.nrf5 @@ -68,7 +68,6 @@ config UART_NRF5_FLOW_CONTROL config UART_NRF5_GPIO_TX_PIN int "TX Pin Number" range 0 31 - default 6 depends on UART_NRF5 depends on GPIO_NRF5 help @@ -77,7 +76,6 @@ config UART_NRF5_GPIO_TX_PIN config UART_NRF5_GPIO_RX_PIN int "RX Pin Number" range 0 31 - default 8 depends on UART_NRF5 depends on GPIO_NRF5 help @@ -86,7 +84,6 @@ config UART_NRF5_GPIO_RX_PIN config UART_NRF5_GPIO_RTS_PIN int "RTS Pin Number" range 0 31 - default 5 depends on UART_NRF5 depends on GPIO_NRF5 depends on UART_NRF5_FLOW_CONTROL @@ -96,7 +93,6 @@ config UART_NRF5_GPIO_RTS_PIN config UART_NRF5_GPIO_CTS_PIN int "CTS Pin Number" range 0 31 - default 7 depends on UART_NRF5 depends on GPIO_NRF5 depends on UART_NRF5_FLOW_CONTROL