From 781d5a2190605c346eec1270ab6021aa0ca2e982 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 17 May 2024 09:14:14 +0100 Subject: [PATCH] cmake: bootloader: Only include dummy values when testing Only includes dummy values for the secure boot bootloader when partition manager is disabled Signed-off-by: Jamie McCrae --- subsys/bootloader/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/subsys/bootloader/CMakeLists.txt b/subsys/bootloader/CMakeLists.txt index bb0ee9dfafa4..7bbcb9740892 100644 --- a/subsys/bootloader/CMakeLists.txt +++ b/subsys/bootloader/CMakeLists.txt @@ -8,11 +8,16 @@ add_subdirectory(bl_boot) zephyr_include_directories(include) -if (NOT IMAGE_NAME AND NOT SYSBUILD) +if(NOT IMAGE_NAME AND (NOT SYSBUILD OR (SYSBUILD AND NOT CONFIG_PARTITION_MANAGER_ENABLED))) message(WARNING "Building bootloader without associated application. " "Dummy values will be used for partition configuration." - "The idiomatic way of including the immutable bootloader is to set " - "the configuration 'CONFIG_SECURE_BOOTLOADER=y' in your applications " - "'prj.conf'.") + "Building bootloader without associated application. ") + + if(NOT SYSBUILD) + message(WARNING "The idiomatic way of including the immutable bootloader is to set " + "the configuration 'CONFIG_SECURE_BOOTLOADER=y' in your applications " + "'prj.conf'.") + endif() + zephyr_include_directories(include/dummy_values/) endif()