commit 3942e9bf8f606dab46cbd6ed22c459382d85422b
author Piotr Dymacz <pepe2k@gmail.com> Mon Jul 18 10:19:25 2022 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Fri Aug 12 13:35:51 2022 +0200
tree 27e9a5ea0cedac4c5f1048f63435aa9cb24aa18c
parent 5130d1dccae299a1d518da9de707bdce9582b096

boot_serial: fix serial recovery mode with timeout

If 'BOOT_SERIAL_WAIT_FOR_DFU' is selected, the CPU shouldn't enter idle
state, waiting for interrupt from the console because we expect booting
if no mcumgr command is received within a configured timeout (with the
'CONFIG_BOOT_SERIAL_WAIT_FOR_DFU_TIMEOUT').

Without this fix, when using 'BOOT_SERIAL_WAIT_FOR_DFU' the boot process
hangs forever, waiting for input from console.

Fixes: e3822f8180ed ("boot_serial: zephyr: Add optional timeout to enter serial recovery")
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index 4ebff17..468fa6a 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -849,7 +849,9 @@
 
     off = 0;
     while (timeout_in_ms > 0 || bs_entry) {
+#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU
         MCUBOOT_CPU_IDLE();
+#endif
         MCUBOOT_WATCHDOG_FEED();
 #ifdef MCUBOOT_SERIAL_WAIT_FOR_DFU
         uint32_t start = k_uptime_get_32();