From 69423786957fcfd44db53b8af4a520baf572d22e Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Thu, 4 Nov 2021 15:55:58 -0300 Subject: [PATCH] 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. Signed-off-by: Gustavo Henrique Nihei --- boot/mcuboot/Makefile | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile index 3fca9bc27..9914fee0c 100644 --- a/boot/mcuboot/Makefile +++ b/boot/mcuboot/Makefile @@ -31,23 +31,27 @@ VPATH += :$(MCUBOOT_UNPACK)$(DELIM)src VPATH += :$(MCUBOOT_SRCDIR) ifneq ($(CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE),) -MAINSRC = mcuboot_agent_main.c +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_agent +PRIORITY += SCHED_PRIORITY_DEFAULT +STACKSIZE += $(CONFIG_DEFAULT_TASK_STACKSIZE) +endif -PROGNAME = mcuboot_confirm -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE) -else ifneq ($(CONFIG_MCUBOOT_BOOTLOADER),) -MAINSRC = mcuboot/boot/nuttx/main.c +ifneq ($(CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE),) +MAINSRC += mcuboot_confirm_main.c -PROGNAME = mcuboot_loader -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = $(CONFIG_DEFAULT_TASK_STACKSIZE) +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