boot/mcuboot: Fix inclusion of more than one example app
Even though the options existed, the second application would override
the values, resulting in the missing first application on the final
binary.
@@ -31,23 +31,27 @@ VPATH += :$(MCUBOOT_UNPACK)$(DELIM)src
VPATH += :$(MCUBOOT_SRCDIR)
ifneq ($(CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE),)
-MAINSRC = mcuboot_agent_main.c
-
-PROGNAME = mcuboot_agent
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-else ifneq ($(CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE),)
-MAINSRC = mcuboot_confirm_main.c
-
-PROGNAME = mcuboot_confirm
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
-else ifneq ($(CONFIG_MCUBOOT_BOOTLOADER),)
-MAINSRC = mcuboot/boot/nuttx/main.c
-
-PROGNAME = mcuboot_loader
-PRIORITY = SCHED_PRIORITY_DEFAULT
-STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE)
+MAINSRC += mcuboot_agent_main.c
+
+PROGNAME += mcuboot_agent
+PRIORITY += SCHED_PRIORITY_DEFAULT
+STACKSIZE += $(CONFIG_DEFAULT_TASK_STACKSIZE)
+endif
+
+ifneq ($(CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE),)
+MAINSRC += mcuboot_confirm_main.c
+
+PROGNAME += mcuboot_confirm
+PRIORITY += SCHED_PRIORITY_DEFAULT
+STACKSIZE += $(CONFIG_DEFAULT_TASK_STACKSIZE)
+endif
+
+ifneq ($(CONFIG_MCUBOOT_BOOTLOADER),)
+MAINSRC += mcuboot/boot/nuttx/main.c
+
+PROGNAME += mcuboot_loader
+PRIORITY += SCHED_PRIORITY_DEFAULT
+STACKSIZE += $(CONFIG_DEFAULT_TASK_STACKSIZE)
endif
CFLAGS += -Wno-undef
