sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

boot/mcuboot: Fix inclusion of more than one example app

Browse Source 
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 <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2021-11-04 15:55:58 -03:00 committed by Xiang Xiao
parent fbdfb0ef96
commit 6942378695
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
boot/mcuboot/Makefile
View File

@ -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