cmake: kconfig: support skipping build of mcuboot

Signed-off-by: Håkon Øye Amundsen <[email protected]>

Author: hakonfam

zephyr/CMakeLists.txt

@@ -3,34 +3,37 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
 
   set(MCUBOOT_BASE ${CMAKE_CURRENT_LIST_DIR}/..)
 
-  zephyr_add_executable(mcuboot)
-  add_subdirectory(${MCUBOOT_BASE}/boot/zephyr ${CMAKE_CURRENT_BINARY_DIR}/mcuboot)
+  zephyr_add_executable(mcuboot require_build)
 
-  # TODO: Assert that the bootloader and image use the same key.
+  if (${require_build})
+    add_subdirectory(${MCUBOOT_BASE}/boot/zephyr ${CMAKE_CURRENT_BINARY_DIR}/mcuboot)
 
-  set(SIGNED_IMAGE signed.hex)
+    # TODO: Assert that the bootloader and image use the same key.
 
-  set_property(GLOBAL APPEND PROPERTY
-    extra_post_build_commands
-    COMMAND
-    ${PYTHON_EXECUTABLE}
-    ${MCUBOOT_BASE}/scripts/imgtool.py
-    sign
-    --key ${MCUBOOT_BASE}/${CONFIG_BOOT_SIGNATURE_KEY_FILE}
-    --header-size ${CONFIG_TEXT_SECTION_OFFSET}
-    --align       ${DT_FLASH_WRITE_BLOCK_SIZE}
-    --version 0.1       # TODO: Configurable?
-    --slot-size 0x32000 # TODO: Configurable?
-    ${KERNEL_HEX_NAME}  # TODO: Enforce that this will be present through Kconfig
-    ${SIGNED_IMAGE}
-    )
+    set(SIGNED_IMAGE signed.hex)
 
-  set_property(GLOBAL APPEND PROPERTY
-    HEX_FILES_TO_MERGE
-    ${SIGNED_IMAGE}
-    )
-  set_property(GLOBAL APPEND PROPERTY
-    HEX_FILES_TO_MERGE_TARGET
-    ${logical_target_for_zephyr_elf}
-    )
+    set_property(GLOBAL APPEND PROPERTY
+      extra_post_build_commands
+      COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${MCUBOOT_BASE}/scripts/imgtool.py
+      sign
+      --key ${MCUBOOT_BASE}/${CONFIG_BOOT_SIGNATURE_KEY_FILE}
+      --header-size ${CONFIG_TEXT_SECTION_OFFSET}
+      --align       ${DT_FLASH_WRITE_BLOCK_SIZE}
+      --version 0.1       # TODO: Configurable?
+      --slot-size 0x32000 # TODO: Configurable?
+      ${KERNEL_HEX_NAME}  # TODO: Enforce that this will be present through Kconfig
+      ${SIGNED_IMAGE}
+      )
+
+    set_property(GLOBAL APPEND PROPERTY
+      HEX_FILES_TO_MERGE
+      ${SIGNED_IMAGE}
+      )
+    set_property(GLOBAL APPEND PROPERTY
+      HEX_FILES_TO_MERGE_TARGET
+      ${logical_target_for_zephyr_elf}
+      )
+  endif() # ${require_build}
 endif()

zephyr/Kconfig

@@ -4,6 +4,33 @@ config MCUBOOT_CMAKELISTS_DIR
 	string "Path to the directory of the MCUBoot CMakeLists.txt file"
 	default "$MCUBOOT_BASE/boot/zephyr/"
 
+
+choice
+	prompt "MCUBoot build strategy"
+	default MCUBOOT_BUILD_STRATEGY_FROM_SOURCE
+
+config MCUBOOT_BUILD_STRATEGY_USE_HEX_FILE
+	# Mandatory option when being built through 'zephyr_add_executable'
+	bool "Use hex file instead of building MCUBoot"
+
+if MCUBOOT_BUILD_STRATEGY_USE_HEX_FILE
+
+config MCUBOOT_HEX_FILE
+	# Mandatory option when being built through 'zephyr_add_executable'
+	string "MCUBoot hex file"
+
+endif # MCUBOOT_USE_HEX_FILE
+
+config MCUBOOT_BUILD_STRATEGY_SKIP_BUILD
+	# Mandatory option when being built through 'zephyr_add_executable'
+	bool "Skip building MCUBoot"
+
+config MCUBOOT_BUILD_STRATEGY_FROM_SOURCE
+	# Mandatory option when being built through 'zephyr_add_executable'
+	bool "Build from source"
+
+endchoice
+
 endif # BOOTLOADER_MCUBOOT
 
 if MCUBOOT || BOOTLOADER_MCUBOOT