[WIP] Multi image building #430

SebastianBoe · 2019-02-22T13:23:04Z

WIP support for multi-image building.

Must be applied simultaneously with zephyrproject-rtos/zephyr#13672

See the Zephyr PR for details.

utzig · 2019-03-05T12:59:04Z

Some of those changes were already merged as part of 048168a, please rebase!

SebastianBoe · 2019-03-05T13:59:38Z

Done

mbolivar · 2019-04-08T19:04:23Z

zephyr/CMakeLists.txt

@@ -0,0 +1,39 @@
+if(CONFIG_BOOTLOADER_MCUBOOT)


Might want to drop a README in this directory or add a comment to this file saying that the zephyr directory is for use of mcuboot as a zephyr module (https://docs.zephyrproject.org/latest/application/index.html#modules-external-projects), and that boot/zephyr is where the Zephyr-specific application code is, to avoid confusing newcomers who don't know to look for boot/zephyr yet.

I've had to clear up confusion that CONFIG_BOOTLOADER_MCUBOOT should not be enabled when building mcuboot itself, but is rather an option that's enabled by applications using MCUboot; this file muddies that distinction a bit, so a comment would be nice to clear up that what's going on here is kind of complex:

Application CMakeLists.txt

Application boilerplate.cmake

Application zephyr_modules.cmake

This file

MCUboot CMakeLists.txt (boot/zephyr/CMakeLists.txt)

MCUboot boilerplate.cmake
...

mbolivar · 2019-04-08T19:09:16Z

zephyr/CMakeLists.txt

+  if (${require_build})
+    add_subdirectory(${MCUBOOT_BASE}/boot/zephyr ${CMAKE_CURRENT_BINARY_DIR}/mcuboot)
+
+    # TODO: Assert that the bootloader and image use the same key.


Tricky: multiple keys are supported simultaneously.

mbolivar · 2019-04-08T19:10:48Z

zephyr/CMakeLists.txt

+      --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?


TODO: Configurable?

I think so. One could set it at CMake time; maybe even let the environment override that. That'd be pretty convenient on macOS and Linux at least.

Could you elaborate the benefits of not simply having this as a Kconfig option?

I'm thinking of things like developer workflows where you want to update this on a build-by-build basis every few minutes, without having to go through the overhead of running menuconfig. An environment variable makes that pretty easy -- not sure if it's possible to have a kconfig option fall back to an env var dynamically, but I believe not. OTOH from a reproducible builds perspective I take your point. Tradeoffs here, your call.

mbolivar · 2019-04-08T19:12:27Z

zephyr/CMakeLists.txt

+      --header-size ${CONFIG_TEXT_SECTION_OFFSET}
+      --align       ${DT_FLASH_WRITE_BLOCK_SIZE}
+      --version 0.1       # TODO: Configurable?
+      --slot-size 0x32000 # TODO: Configurable?


Not configurable; this is from DT (DT_FLASH_AREA_IMAGE_0_SIZE).

mbolivar · 2019-04-08T19:12:56Z

zephyr/CMakeLists.txt

+
+    # TODO: Assert that the bootloader and image use the same key.
+
+    set(SIGNED_IMAGE signed.hex)


Would you mind zephyr.signed.hex, to match the default from west sign?

mbolivar · 2019-04-08T19:20:00Z

zephyr/Kconfig

+
+if MCUBOOT_BUILD_STRATEGY_USE_HEX_FILE
+
+config MCUBOOT_HEX_FILE


I don't think you meant this to be a choice option; did you? Shouldn't it be moved after the endchoice?

mbolivar · 2019-04-08T19:20:35Z

zephyr/Kconfig

+endif # BOOTLOADER_MCUBOOT
+
+if MCUBOOT || BOOTLOADER_MCUBOOT
+# TODO: Support sharing Kconfig configuration between images


That is a really interesting idea!

mbolivar · 2019-04-08T19:21:12Z

boot/zephyr/Kconfig

@@ -60,14 +60,6 @@ config BOOT_SIGNATURE_TYPE_ECDSA_P256

 endchoice

-config BOOT_SIGNATURE_KEY_FILE


Does this break the build when MCUboot is built as a single image?

mbolivar · 2019-04-08T19:22:10Z

boot/zephyr/CMakeLists.txt

+# TODO: Configurable?
+set_property(GLOBAL APPEND PROPERTY
+  HEX_FILES_TO_MERGE
+  ${PROJECT_BINARY_DIR}/zephyr/${KERNEL_HEX_NAME}


Why isn't zephyr_add_executable() taking care of these?

mbolivar · 2019-04-08T19:22:47Z

boot/zephyr/CMakeLists.txt

+  set_property(
+	GLOBAL
+	PROPERTY
+	KEY_FILE


Where is this used?

d3zd3z · 2019-04-18T21:45:20Z

Unless I'm misreading something, the commit is titled "dump: dump\n\ndump". Perhaps a better description is in order.

I'm also wondering if we need a better name for this than "multi image", since we are using multi image to refer to having multiple images that MCUboot knows how to load. I'm not sure what terms are best here. But, "multi-image" from MCUboot's perspective makes sense as MCUboot itself handling multiple images. Maybe "multi build"? I'm not real sure.

Migrate to support multi-image building. Must be applied simultaneously with zephyrproject-rtos/zephyr#13672 See the Zephyr PR for details. Signed-off-by: Sebastian Bøe <[email protected]>

SebastianBoe · 2019-04-19T09:54:12Z

Unless I'm misreading something, the commit is titled "dump: dump\n\ndump". Perhaps a better description is in order.

The commit message has been improved.

SebastianBoe · 2019-04-19T09:56:12Z

I'm also wondering if we need a better name for this than "multi image", since we are using multi image to refer to having multiple images that MCUboot knows how to load. I'm not sure what terms are best here. But, "multi-image" from MCUboot's perspective makes sense as MCUboot itself handling multiple images. Maybe "multi build"? I'm not real sure.

Since these are two different domains, I'm hoping it will always be obvious from context what we are talking about. It will be difficult to change this terminology as it is in wide use already. To disambiguate when not obvious from context we can try to be more verbose, e.g. multi-image building.

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

utzig · 2019-07-12T11:13:08Z

@SebastianBoe Please rebase on latest master!

SebastianBoe · 2019-11-06T08:36:24Z

Closing, zephyrproject-rtos/zephyr#13672 was not accepted.

SebastianBoe mentioned this pull request Feb 22, 2019

Add support for non-recursive single-toolchain multi-image builds zephyrproject-rtos/zephyr#13672

Closed

25 tasks

SebastianBoe force-pushed the multi_image branch 2 times, most recently from 7f25dd0 to 51177e0 Compare March 1, 2019 11:27

SebastianBoe force-pushed the multi_image branch from 51177e0 to 8fd86ad Compare March 5, 2019 13:59

SebastianBoe changed the title ~~[WIP] Multi image~~ [WIP] Multi image building Mar 14, 2019

SebastianBoe force-pushed the multi_image branch 2 times, most recently from 640c107 to c57debc Compare March 14, 2019 14:57

nvlsianpu self-requested a review March 28, 2019 12:32

mbolivar suggested changes Apr 8, 2019

View reviewed changes

SebastianBoe force-pushed the multi_image branch from c57debc to b0bedd7 Compare April 18, 2019 13:09

cmake: Migrate to support multi-image building

083b331

Migrate to support multi-image building. Must be applied simultaneously with zephyrproject-rtos/zephyr#13672 See the Zephyr PR for details. Signed-off-by: Sebastian Bøe <[email protected]>

SebastianBoe force-pushed the multi_image branch from b0bedd7 to 083b331 Compare April 19, 2019 09:53

Prefix dtc overlay with image

49d5af7

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

hakonfam mentioned this pull request Jun 17, 2019

[nrf fromlist] cmake: image-ify DTC_OVERLAY_FILE nrfconnect/sdk-mcuboot#35

Merged

SebastianBoe closed this Nov 6, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Multi image building #430

[WIP] Multi image building #430

SebastianBoe commented Feb 22, 2019

utzig commented Mar 5, 2019

SebastianBoe commented Mar 5, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

hakonfam May 20, 2019 •

edited

Loading

mbolivar May 20, 2019

mbolivar Apr 8, 2019

hakonfam May 20, 2019 •

edited

Loading

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

mbolivar Apr 8, 2019

d3zd3z commented Apr 18, 2019

SebastianBoe commented Apr 19, 2019

SebastianBoe commented Apr 19, 2019

utzig commented Jul 12, 2019

SebastianBoe commented Nov 6, 2019


		# TODO: Assert that the bootloader and image use the same key.

		set(SIGNED_IMAGE signed.hex)


		if MCUBOOT_BUILD_STRATEGY_USE_HEX_FILE

		config MCUBOOT_HEX_FILE

		@@ -60,14 +60,6 @@ config BOOT_SIGNATURE_TYPE_ECDSA_P256

		endchoice

		config BOOT_SIGNATURE_KEY_FILE

[WIP] Multi image building #430

[WIP] Multi image building #430

Conversation

SebastianBoe commented Feb 22, 2019

utzig commented Mar 5, 2019

SebastianBoe commented Mar 5, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hakonfam May 20, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hakonfam May 20, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

d3zd3z commented Apr 18, 2019

SebastianBoe commented Apr 19, 2019

SebastianBoe commented Apr 19, 2019

utzig commented Jul 12, 2019

SebastianBoe commented Nov 6, 2019

hakonfam May 20, 2019 •

edited

Loading

hakonfam May 20, 2019 •

edited

Loading