zephyr/serial_adapter; no need to inject \r on \n anymore.
boot_serial; syscfg tabs to spaces.
Signed-off-by: Marko Kiiskila <marko@runtime.io>
diff --git a/boot/boot_serial/syscfg.yml b/boot/boot_serial/syscfg.yml
index e6c8e5f..6556442 100644
--- a/boot/boot_serial/syscfg.yml
+++ b/boot/boot_serial/syscfg.yml
@@ -24,7 +24,7 @@
restrictions:
- '(BOOT_SERIAL_DETECT_PIN != -1) ||
(BOOT_SERIAL_DETECT_TIMEOUT != 0) ||
- (BOOT_SERIAL_NVREG_INDEX != -1)'
+ (BOOT_SERIAL_NVREG_INDEX != -1)'
BOOT_SERIAL_DETECT_PIN_CFG:
description: >
@@ -50,7 +50,7 @@
restrictions:
- '(BOOT_SERIAL_DETECT_PIN != -1) ||
(BOOT_SERIAL_DETECT_TIMEOUT != 0) ||
- (BOOT_SERIAL_NVREG_INDEX != -1)'
+ (BOOT_SERIAL_NVREG_INDEX != -1)'
BOOT_SERIAL_DETECT_STRING:
description: >
@@ -89,4 +89,4 @@
restrictions:
- '(BOOT_SERIAL_DETECT_PIN != -1) ||
(BOOT_SERIAL_DETECT_TIMEOUT != 0) ||
- (BOOT_SERIAL_NVREG_INDEX != -1)'
+ (BOOT_SERIAL_NVREG_INDEX != -1)'
diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
index 70d352d..88937f3 100644
--- a/boot/zephyr/serial_adapter.c
+++ b/boot/zephyr/serial_adapter.c
@@ -53,9 +53,6 @@
int
console_out(int c)
{
- if ('\n' == c) {
- uart_poll_out(uart_dev, '\r');
- }
uart_poll_out(uart_dev, c);
return c;