You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/09/13 15:37:29 UTC
incubator-mynewt-core git commit: boot - Fix after syscfg/sysinit
commit.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/sterly_refactor d98ddc1c5 -> c181ac331
boot - Fix after syscfg/sysinit commit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c181ac33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c181ac33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c181ac33
Branch: refs/heads/sterly_refactor
Commit: c181ac331b7af73c552855a0d50e260ba64a4b99
Parents: d98ddc1
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Sep 13 08:37:38 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Sep 13 08:37:38 2016 -0700
----------------------------------------------------------------------
apps/boot/src/boot.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c181ac33/apps/boot/src/boot.c
----------------------------------------------------------------------
diff --git a/apps/boot/src/boot.c b/apps/boot/src/boot.c
index 1fb70a4..af573a4 100755
--- a/apps/boot/src/boot.c
+++ b/apps/boot/src/boot.c
@@ -20,6 +20,7 @@
#include <assert.h>
#include <stddef.h>
#include <inttypes.h>
+#include "syscfg/syscfg.h"
#include <hal/flash_map.h>
#include <os/os.h>
#include <bsp/bsp.h>
@@ -36,7 +37,7 @@
#else
#error "Need NFFS or FCB for config storage"
#endif
-#ifdef MYNEWT_VAL(BOOT_SERIAL)
+#if MYNEWT_VAL(BOOT_SERIAL)
#include <hal/hal_gpio.h>
#include <boot_serial/boot_serial.h>
#endif
@@ -49,7 +50,7 @@
#define BOOT_AREA_DESC_MAX (256)
#define AREA_DESC_MAX (BOOT_AREA_DESC_MAX)
-#ifdef BOOT_SERIAL
+#if MYNEWT_VAL(BOOT_SERIAL)
#define BOOT_SER_PRIO_TASK 1
#define BOOT_SER_STACK_SZ 512
#define BOOT_SER_CONS_INPUT 128