Enable Uart console and boot serial

Signed-off-by: mateo-ligne-netatmo <[email protected]>
mcu-tools · Dec 16, 2021 · a59fef4 · a59fef4
1 parent 7062b50
commit a59fef4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/boot/zephyr/include/serial_adapter/serial_adapter.h b/boot/zephyr/include/serial_adapter/serial_adapter.h
@@ -21,12 +21,12 @@ int
 console_out(int c);
 
 void
-console_write(const char *str, int cnt);
+console_write_boot(const char *str, int cnt);
 
 int
 boot_console_init(void);
 
 int
-console_read(char *str, int str_cnt, int *newline);
+console_read_boot(char *str, int str_cnt, int *newline);
 
 #endif // SERIAL_ADAPTER
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
@@ -39,8 +39,8 @@
 #include "serial_adapter/serial_adapter.h"
 
 const struct boot_uart_funcs boot_funcs = {
-    .read = console_read,
-    .write = console_write
+    .read = console_read_boot,
+    .write = console_write_boot
 };
 #endif
 

diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
@@ -22,8 +22,8 @@
 #include "bootutil/bootutil_log.h"
 #include <usb/usb_device.h>
 
-#if defined(CONFIG_BOOT_SERIAL_UART) && defined(CONFIG_UART_CONSOLE)
-#error Zephyr UART console must been disabled if serial_adapter module is used.
+#if DT_SAME_NODE(DT_CHOSEN(zephyr_uart_mcumgr), DT_CHOSEN(zephyr_console))
+#error Zephyr UART console and boot serial UART must be two different devices
 #endif
 
 BOOT_LOG_MODULE_REGISTER(serial_adapter);
@@ -61,7 +61,7 @@ console_out(int c)
 }
 
 void
-console_write(const char *str, int cnt)
+console_write_boot(const char *str, int cnt)
 {
 	int i;
 
@@ -73,7 +73,7 @@ console_write(const char *str, int cnt)
 }
 
 int
-console_read(char *str, int str_size, int *newline)
+console_read_boot(char *str, int str_size, int *newline)
 {
 	char *line;
 	int len;
@@ -192,7 +192,7 @@ static int
 boot_uart_fifo_init(void)
 {
 #ifdef CONFIG_BOOT_SERIAL_UART
-	uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+	uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_uart_mcumgr));
 #elif CONFIG_BOOT_SERIAL_CDC_ACM
 	uart_dev = DEVICE_DT_GET_ONE(zephyr_cdc_acm_uart);
 #endif