commit ea34f9a77be63496535cdf189929c40207dae88f
author Fabio Utzig <utzig@apache.org> Tue Oct 01 09:28:58 2019 -0300
committer Fabio Utzig <utzig@utzig.org> Tue Oct 01 17:36:12 2019 -0300
tree 0e3282dbeedef5e17dbd817ca4e521ad84be9518
parent 61fd888a7f4d741714553f36839dd49fb0065731

Fix Mynewt boot_serial unittest

The boot_serial test was failing build because it hadn't been updated to
use new multi-image flash area nomenclature. This fixes the build.

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

boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c

diff --git a/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c b/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
index 506000d..53a7199 100644
--- a/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
+++ b/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+#include <flash_map_backend/flash_map_backend.h>
 #include <tinycbor/cborconstants_p.h>
 
 #include "boot_test.h"
@@ -105,7 +106,7 @@
     /*
      * Validate contents inside the primary slot
      */
-    rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY, &fap);
+    rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY(0), &fap);
     assert(rc == 0);
 
     for (off = 0; off < sizeof(img); off += sizeof(enc_img)) {

boot/mynewt/flash_map_backend/pkg.yml

diff --git a/boot/mynewt/flash_map_backend/pkg.yml b/boot/mynewt/flash_map_backend/pkg.yml
index 5f04e29..ba1bf5b 100644
--- a/boot/mynewt/flash_map_backend/pkg.yml
+++ b/boot/mynewt/flash_map_backend/pkg.yml
@@ -11,3 +11,4 @@
 
 pkg.deps:
     - "@apache-mynewt-core/sys/flash_map"
+    - "@mcuboot/boot/mynewt/mcuboot_config"