diff --git a/port/nrf5-zephyr/hci_firmware.patch b/port/nrf5-zephyr/hci_firmware.patch index 3a0a4523c..9e39d5ccf 100644 --- a/port/nrf5-zephyr/hci_firmware.patch +++ b/port/nrf5-zephyr/hci_firmware.patch @@ -1,16 +1,3 @@ -diff --git a/samples/bluetooth/hci_uart/nrf5.conf b/samples/bluetooth/hci_uart/nrf5.conf -index 8b268bc73..b00853925 100644 ---- a/samples/bluetooth/hci_uart/nrf5.conf -+++ b/samples/bluetooth/hci_uart/nrf5.conf -@@ -4,7 +4,7 @@ CONFIG_UART_CONSOLE=n - CONFIG_GPIO=y - CONFIG_SERIAL=y - CONFIG_UART_INTERRUPT_DRIVEN=y --CONFIG_UART_NRF5_BAUD_RATE=1000000 -+CONFIG_UART_NRF5_BAUD_RATE=115200 - CONFIG_UART_NRF5_FLOW_CONTROL=y - CONFIG_MAIN_STACK_SIZE=512 - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 diff --git a/samples/bluetooth/hci_uart/src/Makefile b/samples/bluetooth/hci_uart/src/Makefile index ae704cee5..833816b50 100644 --- a/samples/bluetooth/hci_uart/src/Makefile @@ -92,19 +79,6 @@ index ecec3ccc3..88cdba5fc 100644 #endif #if defined(CONFIG_BT_CTLR_SUBVERSION_NUMBER) #define RADIO_BLE_SUB_VERSION_NUMBER \ -diff --git a/drivers/serial/uart_nrf5.c b/drivers/serial/uart_nrf5.c -index e8ebfa5d9..9a5c70e1e 100644 ---- a/drivers/serial/uart_nrf5.c -+++ b/drivers/serial/uart_nrf5.c -@@ -227,7 +227,7 @@ static int uart_nrf5_init(struct device *dev) - - #endif /* CONFIG_UART_NRF5_FLOW_CONTROL */ - -- DEV_DATA(dev)->baud_rate = CONFIG_UART_NRF5_BAUD_RATE; -+ DEV_DATA(dev)->baud_rate = 115200; - - /* Set baud rate */ - err = baudrate_set(dev, DEV_DATA(dev)->baud_rate, diff --git a/subsys/Kconfig b/subsys/Kconfig index 4966a0b81..546713963 100644 --- a/subsys/Kconfig