commit 1d46c944edebf09943cf1cd91891fc4cea0fced8
author Fabio Utzig <utzig@apache.org> Mon Feb 26 10:38:00 2018 -0300
committer Fabio Utzig <utzig@utzig.org> Thu Mar 29 16:33:25 2018 -0300
tree d57a4460efae6dc44f87854140f93f7e039298fa
parent 2a33aa26eda87c56210449eb4c852c033ff75a50

Always enable uart, use blocking mode

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/mynewt/src/main.c

diff --git a/boot/mynewt/src/main.c b/boot/mynewt/src/main.c
index 63a274b..76280e7 100755
--- a/boot/mynewt/src/main.c
+++ b/boot/mynewt/src/main.c
@@ -24,6 +24,7 @@
 #include <assert.h>
 #include <stddef.h>
 #include <inttypes.h>
+#include <stdio.h>
 #include "syscfg/syscfg.h"
 #include <flash_map/flash_map.h>
 #include <os/os.h>
@@ -31,10 +32,10 @@
 #include <hal/hal_bsp.h>
 #include <hal/hal_system.h>
 #include <hal/hal_flash.h>
+#include <sysinit/sysinit.h>
 #ifdef MCUBOOT_SERIAL
 #include <hal/hal_gpio.h>
 #include <boot_serial/boot_serial.h>
-#include <sysinit/sysinit.h>
 #endif
 #include <console/console.h>
 #include "bootutil/image.h"
@@ -67,13 +68,11 @@
     int rc;
 
     hal_bsp_init();
-#ifdef MCUBOOT_SERIAL
+
     /* initialize uart without os */
     os_dev_initialize_all(OS_DEV_INIT_PRIMARY);
     sysinit();
-#else
-    flash_map_init();
-#endif
+    console_blocking_mode();
 
 #ifdef MCUBOOT_SERIAL
     /*
@@ -88,6 +87,7 @@
         assert(0);
     }
 #endif
+
     rc = boot_go(&rsp);
     assert(rc == 0);