commit ba1fbe607b3075910f9836fdab143ef081bdbf2a
author Fabio Utzig <utzig@apache.org> Fri Jul 21 14:01:20 2017 -0300
committer Fabio Utzig <utzig@utzig.org> Fri Jul 21 15:58:44 2017 -0300
tree 0deadfac31826222af6f89d231df60c5f4f12572
parent d0116731a9660539ea7f27a0e636fdd27f0c0982

Fix running newtmgr when building for mcuboot

This enables mynewt to use mcuboot as a remote repository, which is only
required when using newtmgr to manage images. Since mcuboot has slightly
changed the trailer format, newtmgr built against the bundled mynewt
bootloader writes the magic and flags to the wrong location.

To build a mynewt app the wants to run with mcuboot as the bootloader
and requires newtmgr one needs to change the app's pkg.yml dependencies
as follows:

-    - boot/bootutil
+    - "@mcuboot/boot/bootutil"

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

boot/bootutil/src/image_validate.c

diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
index 2741c37..be856fd 100644
--- a/boot/bootutil/src/image_validate.c
+++ b/boot/bootutil/src/image_validate.c
@@ -28,8 +28,8 @@
 #include "bootutil/sha256.h"
 #include "bootutil/sign_key.h"
 
-#ifdef APP_mynewt
-#include "mynewt/config.h"
+#ifdef MCUBOOT_MYNEWT
+#include "mcuboot_config/mcuboot_config.h"
 #endif
 
 #ifdef MCUBOOT_SIGN_RSA