[nrf fromtree] zephyr: Fix support for single application with serial recovery

The commit fixes compilation error when attempting to build
support for single application slot with serial recovery enabled.

Upstream commit: e5ecbce

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 10fb108)

Author: de-nordic

boot/boot_serial/src/boot_serial.c

@@ -63,6 +63,10 @@
 
 MCUBOOT_LOG_MODULE_DECLARE(mcuboot);
 
+#ifndef BOOT_IMAGE_NUMBER
+#define BOOT_IMAGE_NUMBER MCUBOOT_IMAGE_NUMBER
+#endif
+
 #define BOOT_SERIAL_INPUT_MAX   512
 #define BOOT_SERIAL_OUT_MAX     (128 * MCUBOOT_IMAGE_NUMBER)
 
@@ -77,10 +81,6 @@ MCUBOOT_LOG_MODULE_DECLARE(mcuboot);
 #define htons(x) sys_cpu_to_be16(x)
 #endif
 
-#ifndef BOOT_IMAGE_NUMBER
-#define BOOT_IMAGE_NUMBER MCUBOOT_IMAGE_NUMBER
-#endif
-
 #if (BOOT_IMAGE_NUMBER > 1)
 #define IMAGES_ITER(x) for ((x) = 0; (x) < BOOT_IMAGE_NUMBER; ++(x))
 #else

boot/zephyr/include/mcuboot_config/mcuboot_config.h

@@ -67,6 +67,7 @@
 
 #ifdef CONFIG_SINGLE_APPLICATION_SLOT
 #define MCUBOOT_SINGLE_APPLICATION_SLOT 1
+#define MCUBOOT_IMAGE_NUMBER    1
 #else
 
 #ifdef CONFIG_BOOT_SWAP_USING_MOVE