From 84ea656cedc7affa37f6da4309445391ef947871 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Sun, 15 Mar 2026 19:30:19 +0000 Subject: [PATCH] app: rename the sysbuild-dfu.conf file to sysbuild.conf Rename the sysbuild-dfu.conf file to sysbuild.conf in order to simplify builds. For boards requiring a different sysbuild configuration (e.g. for using sysbuild for building firmware for a secondary/auxilliary core) users can specify a non-default SB_CONF_FILE. Signed-off-by: Henrik Brix Andersen --- README.md | 6 +++--- app/sample.yaml | 3 --- app/{sysbuild-dfu.conf => sysbuild.conf} | 0 doc/building.rst | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-) rename app/{sysbuild-dfu.conf => sysbuild.conf} (100%) diff --git a/README.md b/README.md index 52c144c..2d28633 100644 --- a/README.md +++ b/README.md @@ -112,11 +112,11 @@ CANnectivity supports USB Device Firmware Upgrade with boards without an on-board programmer. To build CANnectivity with MCUboot integration for USB DFU use -[sysbuild](https://docs.zephyrproject.org/latest/build/sysbuild/index.html) with the -`sysbuild-dfu.conf` configuration file when building for your board (here `frdm_k64f`): +[sysbuild](https://docs.zephyrproject.org/latest/build/sysbuild/index.html) when building for your +board (here `frdm_k64f`): ```shell -west build -b frdm_k64f/mk64f12 --sysbuild cannectivity/app/ -- -DSB_CONF_FILE=sysbuild-dfu.conf +west build -b frdm_k64f/mk64f12 --sysbuild cannectivity/app/ ``` After building, MCUboot and the CANnectivity firmware can be flashed to the board by running the diff --git a/app/sample.yaml b/app/sample.yaml index 4ecb88c..fb5bafb 100644 --- a/app/sample.yaml +++ b/app/sample.yaml @@ -113,7 +113,6 @@ tests: - canbardo extra_args: - FILE_SUFFIX=legacy - - SB_CONF_FILE=sysbuild-dfu.conf app.cannectivity.dfu: sysbuild: true depends_on: @@ -124,5 +123,3 @@ tests: - frdm_k64f - frdm_mcxn947/mcxn947/cpu0 - lpcxpresso55s16 - extra_args: - - SB_CONF_FILE=sysbuild-dfu.conf diff --git a/app/sysbuild-dfu.conf b/app/sysbuild.conf similarity index 100% rename from app/sysbuild-dfu.conf rename to app/sysbuild.conf diff --git a/doc/building.rst b/doc/building.rst index b88aed1..4847dca 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -47,12 +47,11 @@ CANnectivity supports USB :external+zephyr:ref:`Device Firmware Upgrade ` ( `MCUboot`_ bootloader. This is intended for use with boards without an on-board programmer. To build CANnectivity with MCUboot integration for USB DFU use :external+zephyr:ref:`sysbuild -` with the ``sysbuild-dfu.conf`` configuration file when building for your board (here -``frdm_k64f``): +` when building for your board (here ``frdm_k64f``): .. code-block:: console - west build -b frdm_k64f/mk64f12 --sysbuild ../custom/cannectivity/app/ -- -DSB_CONF_FILE=sysbuild-dfu.conf + west build -b frdm_k64f/mk64f12 --sysbuild ../custom/cannectivity/app/ After building, MCUboot and the CANnectivity firmware can be flashed to the board by running the ``west flash`` command.