commit c4bf78009c61acfbc25d5b86fa274ccef1a6294b
author Emanuele Di Santo <emdi@nordicsemi.no> Fri Jul 20 11:39:57 2018 +0200
committer Carles Cufí <carles.cufi@nordicsemi.no> Tue Oct 30 18:17:23 2018 +0100
tree 909865164bab70e0f4389e32852c099ae3f3a5c5
parent 68b305369463bc39d66b336b9b68d687e4ddd79f

zephyr: selectable serial device for recovery

This commit adds a choice for the device to use for serial recovery.

Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

fixup

boot/zephyr/serial_adapter.c

diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
index 92aa6c6..fc39f71 100644
--- a/boot/zephyr/serial_adapter.c
+++ b/boot/zephyr/serial_adapter.c
@@ -188,7 +188,11 @@
 static int
 boot_uart_fifo_init(void)
 {
+#ifdef CONFIG_BOOT_SERIAL_UART
 	uart_dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME);
+#elif CONFIG_BOOT_SERIAL_CDC_ACM
+	uart_dev = device_get_binding(CONFIG_CDC_ACM_PORT_NAME);
+#endif
 	u8_t c;
 
 	if (!uart_dev) {