commit 736e446f080651f2bc6fc013f0037763bb813976
author Marti Bolivar <marti.bolivar@linaro.org> Mon May 01 23:15:29 2017 -0400
committer Marti Bolivar <marti.bolivar@linaro.org> Tue May 09 13:17:45 2017 -0400
tree 62320ae60c2d112052924164b5e9f1a4e594fa65
parent a05cba2c7a12274d0847e10cc30805a771ffbed3

Take flash base address into account when booting.

Use flash_device_base() in the boot code to compute a real address,
given the offset returned by boot_go().

Signed-off-by: Marti Bolivar <marti.bolivar@linaro.org>

apps/boot/src/boot.c

diff --git a/apps/boot/src/boot.c b/apps/boot/src/boot.c
index 9371186..0a26edb 100755
--- a/apps/boot/src/boot.c
+++ b/apps/boot/src/boot.c
@@ -47,6 +47,7 @@
 main(void)
 {
     struct boot_rsp rsp;
+    uintptr_t flash_base;
     int rc;
 
 #if MYNEWT_VAL(BOOT_SERIAL)
@@ -70,7 +71,11 @@
     rc = boot_go(&rsp);
     assert(rc == 0);
 
-    hal_system_start((void *)(rsp.br_image_off + rsp.br_hdr->ih_hdr_size));
+    rc = flash_device_base(rsp->br_flash_dev_id, &flash_base);
+    assert(rc == 0);
+
+    hal_system_start((void *)(flash_base + rsp.br_image_off +
+                              rsp.br_hdr->ih_hdr_size));
 
     return 0;
 }