commit cd07ed3b979d30f9b3feea38c382067655cd6710
author Dominik Ermel <dominik.ermel@nordicsemi.no> Wed Feb 17 15:18:01 2021 +0000
committer Fabio Utzig <utzig@utzig.org> Fri Feb 19 08:23:00 2021 -0300
tree 69c5665c3fb15262e7cfbb43c657b5c1de63c36f
parent 8a5e49876eae4f2d9bc8ced2fa2e2be0d24ddd68

boot/zephyr: Fix Direct-XIP boot messages

The commit changes banner message to indicate that bootloader has been
built for Direct-XIP mode.
It also removes, in Direct-XIP compiled code, information on jumping
into first slot: that information is not always correct for Direct-XIP
and other messages correctly point slot that will be used.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index f0ef3e5..1c8cd6d 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -371,7 +371,11 @@
 
     MCUBOOT_WATCHDOG_FEED();
 
+#if !defined(MCUBOOT_DIRECT_XIP)
     BOOT_LOG_INF("Starting bootloader");
+#else
+    BOOT_LOG_INF("Starting Direct-XIP bootloader");
+#endif
 
 #ifdef CONFIG_MCUBOOT_INDICATION_LED
     /* LED init */
@@ -498,7 +502,11 @@
     BOOT_LOG_INF("Bootloader chainload address offset: 0x%x",
                  rsp.br_image_off);
 
+#if defined(MCUBOOT_DIRECT_XIP)
+    BOOT_LOG_INF("Jumping to the image slot");
+#else
     BOOT_LOG_INF("Jumping to the first image slot");
+#endif
     ZEPHYR_BOOT_LOG_STOP();
     do_boot(&rsp);