Skip to content

Commit 5d5158a

Browse files
Relocate module Kconfig beneath $module/zephyr/
Separate `boot/zephyr/Kconfig` into the portion to be picked up through `zephyr/module.yml` (variable declarations) and the portion appropriate for a top-level Kconfig (main menu, sourcing Kconfig.zephyr). Relocate all the module-specific Kconfig content beneath `$mcuboot/zephyr/` and extend `$mcuboot/zephyr/module.yml` to reference it. Fix up mcuboot-specific internal files to get the existing builds to pass. Verified by: 1. building with `-t guiconfig` and manually verifying the relocation of mcuboot Kconfig content within the Modules:mcuboot section. 2. building a full image and verifying the .map file did not change in flash or ram size. 3. Further verified that the following testcases still pass with mcuboot options on twister: mcuboot/boot/zephyr zephyr/tests/subsys/dfu zephyr/samples/subsys/mgmt/mcumgr/smp_svr Signed-off-by: Gregory SHUE <[email protected]>
1 parent 0a7a081 commit 5d5158a

File tree

6 files changed

+666
-651
lines changed

6 files changed

+666
-651
lines changed

boot/bootutil/zephyr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(CONFIG_MCUBOOT_BOOTUTIL_LIB)
66

77
zephyr_interface_library_named(MCUBOOT_BOOTUTIL)
88

9-
target_include_directories(MCUBOOT_BOOTUTIL INTERFACE
9+
zephyr_include_directories(MCUBOOT_BOOTUTIL INTERFACE
1010
../
1111
../include
1212
../../zephyr/include

0 commit comments

Comments
 (0)