commit c49099c284d71e6bc3f5dce95e8131e23c8c2651
author Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl> Fri Feb 16 17:10:51 2018 +0100
committer David Brown <davidb@davidb.org> Thu Feb 22 15:51:39 2018 -0700
tree 32a6b57bf10e65748558676877891f278eac8579
parent 1a2e41ae44514a7fd1c4f155e36e392bcaed7561

Make boot serial work on Mynewt

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
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 3033d07..384567b 100755
--- a/boot/mynewt/src/main.c
+++ b/boot/mynewt/src/main.c
@@ -66,11 +66,13 @@
     uintptr_t flash_base;
     int rc;
 
+    hal_bsp_init();
+    os_dev_initialize_all(OS_DEV_INIT_PRIMARY);
+    os_dev_initialize_all(OS_DEV_INIT_SECONDARY);
 #ifdef MCUBOOT_SERIAL
     sysinit();
 #else
     flash_map_init();
-    hal_bsp_init();
 #endif
 
 #ifdef MCUBOOT_SERIAL
@@ -78,15 +80,10 @@
      * Configure a GPIO as input, and compare it against expected value.
      * If it matches, await for download commands from serial.
      */
-#ifdef MCUBOOT_MYNEWT
     hal_gpio_init_in(MYNEWT_VAL(BOOT_SERIAL_DETECT_PIN),
                      MYNEWT_VAL(BOOT_SERIAL_DETECT_PIN_CFG));
     if (hal_gpio_read(MYNEWT_VAL(BOOT_SERIAL_DETECT_PIN)) ==
                       MYNEWT_VAL(BOOT_SERIAL_DETECT_PIN_VAL)) {
-#else
-    hal_gpio_init_in(BOOT_SERIAL_DETECT_PIN, BOOT_SERIAL_DETECT_PIN_CFG);
-    if (hal_gpio_read(BOOT_SERIAL_DETECT_PIN) == BOOT_SERIAL_DETECT_PIN_VAL) {
-#endif
         boot_serial_start(BOOT_SER_CONS_INPUT);
         assert(0);
     }