Skip to content

Commit 001f630

Browse files
committed
[nrf fromlist] dfu: Fix MCUBOOT_UPDATE_FOOTER_SIZE warning
The warning was the result of the MCUBOOT_UPDATE_FOOTER_SIZE Kconfig option being under "if IMG_MANAGER", but at the same time being unconditionally set in by CMake mcuboot. At the same there is no way for CMake to find out if CONFIG_IMG_MANAGER is set before setting the value of CONFIG_MCUBOOT_UPDATE_FOOTER_SIZE (as the value of CONFIG_IMG_MANAGER is uknown before finishing Kconfig parsing). Upstream PR #: 90721 Signed-off-by: Artur Hadasz <[email protected]>
1 parent 6131774 commit 001f630

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

subsys/dfu/Kconfig

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@ menuconfig IMG_MANAGER
1414
help
1515
Enable support for managing DFU image.
1616

17+
# This option is defined regardless of whether IMG_MANAGER is enabled to prevent
18+
# build warnings when IMG_MANAGER is not selected - as it is being unconditionally
19+
# set in MCUBOOT.
20+
config MCUBOOT_UPDATE_FOOTER_SIZE
21+
hex "Estimated update footer size"
22+
default 0x0
23+
help
24+
Estimated size of update image data, which is used to prevent loading of firmware updates
25+
that MCUboot cannot update due to being too large. This should be set from sysbuild, only
26+
used when MCUMGR_GRP_IMG_TOO_LARGE_SYSBUILD is enabled.
27+
1728
if IMG_MANAGER
1829

1930
choice
@@ -52,14 +63,6 @@ config MCUBOOT_TRAILER_SWAP_TYPE
5263
Disable this option if need to be compatible with earlier version
5364
of MCUBoot.
5465

55-
config MCUBOOT_UPDATE_FOOTER_SIZE
56-
hex "Estimated update footer size"
57-
default 0x0
58-
help
59-
Estimated size of update image data, which is used to prevent loading of firmware updates
60-
that MCUboot cannot update due to being too large. This should be set from sysbuild, only
61-
used when MCUMGR_GRP_IMG_TOO_LARGE_SYSBUILD is enabled.
62-
6366
config IMG_BLOCK_BUF_SIZE
6467
int "Image writer buffer size"
6568
default 512

0 commit comments

Comments
 (0)