OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Always enable uart, use blocking mode 

Signed-off-by: Fabio Utzig <utzig@apache.org>
This commit is contained in:
Fabio Utzig 2018-02-26 10:38:00 -03:00 committed by Fabio Utzig
parent 2a33aa26ed
commit 1d46c944ed
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot/mynewt/src/main.c
View File

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