patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

mcuboot: move the MCUboot kconfig file to modules/

Browse source 
After the MCUboot configuration options were moved out of the main
Kconfig.zephyr they were placed in a new Kconfig.mcuboot in the root of
the repo. This is not right, and the file belongs in the modules/
folder.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2023-05-16 17:15:04 +02:00 committed by Anas Nashif
parent 2b6dc7d778
commit 837245fcec
5 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kconfig.zephyr
View file

@ -795,8 +795,6 @@ config BOOTLOADER_SRAM_SIZE
- Zephyr is a !XIP image, which implicitly assumes existence of a
bootloader that loads the Zephyr !XIP image onto SRAM.
source "Kconfig.mcuboot"
config BOOTLOADER_ESP_IDF
bool "ESP-IDF bootloader support"
depends on (SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3 || SOC_ESP32S3) && !BOOTLOADER_MCUBOOT

5
doc/releases/release-notes-3.4.rst
View file

@ -575,6 +575,11 @@ HALs
MCUboot
*******
* Relocated the MCUboot Kconfig options from the main ``Kconfig.zephyr`` file to
a new ``modules/Kconfig.mcuboot`` module-specific file. This means that, for
interactive Kconfig interfaces, the MCUboot options will now be located under
``Modules`` instead of under ``Boot Options``.
* Added :kconfig:option:`CONFIG_MCUBOOT_CMAKE_WEST_SIGN_PARAMS` that allows to pass arguments to
west sign when invoked from cmake.

2
modules/Kconfig
View file

@ -42,7 +42,7 @@ source "modules/Kconfig.vega"
source "modules/Kconfig.wurthelektronik"
source "modules/Kconfig.xtensa"
source "modules/zcbor/Kconfig"
source "modules/Kconfig.mcuboot_bootutil"
source "modules/Kconfig.mcuboot"
comment "Unavailable modules, please install those via the project manifest."

30
Kconfig.mcuboot → modules/Kconfig.mcuboot
View file

@ -179,3 +179,33 @@ config MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
endchoice # MCUBOOT_BOOTLOADER_MODE
endif # BOOTLOADER_MCUBOOT
menuconfig MCUBOOT_BOOTUTIL_LIB
bool "MCUboot utility library"
help
Enable MCUboot utility library which implements functions
required by the chain-loaded application and the MCUboot.
if MCUBOOT_BOOTUTIL_LIB
# hidden option for disabling module-own log configuration
# while building MCUboot bootloader
config MCUBOOT_BOOTUTIL_LIB_OWN_LOG
bool
default y
if MCUBOOT_BOOTUTIL_LIB_OWN_LOG
module = MCUBOOT_UTIL
module-str = MCUboot bootutil
source "subsys/logging/Kconfig.template.log_config"
endif
config BOOT_IMAGE_ACCESS_HOOKS
bool "Hooks for overriding MCUboot's bootutil native routines"
help
Allow to provide procedures for override or extend native
MCUboot's routines required for access the image data.
It is up to the application project to add source file which
implements hooks to the build.
endif # MCUBOOT_BOOTUTIL_LIB

32
modules/Kconfig.mcuboot_bootutil
View file

@ -1,32 +0,0 @@
# Copyright (c) 2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
menuconfig MCUBOOT_BOOTUTIL_LIB
bool "MCUboot utility library"
help
Enable MCUboot utility library which implements functions
required by the chain-loaded application and the MCUboot.
if MCUBOOT_BOOTUTIL_LIB
# hidden option for disabling module-own log configuration
# while building MCUboot bootloader
config MCUBOOT_BOOTUTIL_LIB_OWN_LOG
bool
default y
if MCUBOOT_BOOTUTIL_LIB_OWN_LOG
module = MCUBOOT_UTIL
module-str = MCUboot bootutil
source "subsys/logging/Kconfig.template.log_config"
endif
config BOOT_IMAGE_ACCESS_HOOKS
bool "Hooks for overriding MCUboot's bootutil native routines"
help
Allow to provide procedures for override or extend native
MCUboot's routines required for access the image data.
It is up to the application project to add source file which
implements hooks to the build.
endif # MCUBOOT_BOOTUTIL_LIB