docs: updated readme

README.md

@@ -1,6 +1,6 @@
-# MCUBoot Implementation Guide
+# UTAT Device Firmware Upgrade with MCUboot
 
-Documentation of the steps taken to implement MCUBoot on a Nucleo G431RB development board.
+Documentation of the steps taken to implement MCUBoot for Device Firmware Upgrades.
 
 ## Environnment config
 Use the environment written in flake.nix by running `nix develop`
@@ -28,10 +28,6 @@ MCUBoot is a bootloader for Zephyr, which allows multiple firmwares to exist on
 
 [Abstract MCUBoot Guide](https://docs.mcuboot.com/readme-zephyr.html)
 
-```sh
-west build -p always -b nucleo_g431rb samples/basic/blinky
-west flash --runner pyocd # had to su root first to run this (after running nix develop)
-```
 
 
 ## Configure partition sizes
@@ -56,74 +52,135 @@ I created a partition for MCUBoot, two firmware slots, and additional storage in
 		boot_partition: partition@0 {
 			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
-			reg = <0x00000000 0x00008000>;
+			reg = <0x00000000 0x0000C000>;
 		};
 
-		slot0_partition: partition@8000 {
+		slot0_partition: partition@C000 {
 			compatible = "zephyr,mapped-partition";
 			label = "image-0";
-			reg = <0x00008000 0x00010000>;
+			reg = <0x0000C000 0x0000A000>;
 		};
 
-		slot1_partition: partition@10000 {
+		slot1_partition: partition@14000 {
 			compatible = "zephyr,mapped-partition";
 			label = "image-1";
-			reg = <0x00010000 0x0018000>;
+			reg = <0x00016000 0x0000A000>;
-		};
-
-		storage_partition: partition@18000 {
-			compatible = "zephyr,mapped-partition";
-			label = "storage";
-			reg = <0x00018000 0x00020000>;
 		};
 	};
 };
-
 ```
 
-## Try to build MCUBoot
+(Originally my partitions were 8000B each but MCUBoot would not build as its boot partition was too small. By using direct-xip there is no need for additional storage for copying images either.)
+
+
+## Enable building for MCUboot with direct-xip
+Add these lines to `bootloader/mcuboot/boot/zephyr/prj.conf`
+
 ```sh
-west build -p always -b nucleo_g431rb bootloader/mcuboot/boot/zephyr
+### Must be enabled to build applications for MCUboot
+CONFIG_BOOTLOADER_MCUBOOT=y
+### Allows in-place execution
+CONFIG_BOOT_DIRECT_XIP=y
+### Allows switching the image
+CONFIG_BOOT_DIRECT_XIP_REVERT=y
+```
+
+Then in `zephyr/samples/basic/blinky/prj.conf` and `zephyr/samples/basic/blinkyslow/prj.conf` add the following:
+```sh
+CONFIG_BOOTLOADER_MCUBOOT=y
+CONFIG_IMG_MANAGER=y
+CONFIG_FLASH=y
+CONFIG_REBOOT=y
+```
+
+## Enable switching firmware
+Each time a peice of firmware is run, set the other one as the upgrade so it runs next time. Add this to the code early in main:
+
+```c
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/sys/reboot.h>
+
+int main() {
+	/* Confirm ourselves so MCUboot doesn't revert us on a later reset */
+	if (!boot_is_img_confirmed()) {
+		boot_write_img_confirmed();
+	}
+
+	/* Arm a permanent swap so the other image runs after the next reset */
+	boot_request_upgrade(BOOT_UPGRADE_PERMANENT);
+	...
+}
+```
+
+Also, create an overlay for the firmware being executed in place. This is so the code jumps to addresses in the right block. Create `zephyr/samples/basic/blinkyslow/boards/nucleo_g431rb.overlay`
+
+```
+/ {
+	chosen {
+		zephyr,code-partition = &slot1_partition;
+	};
+};
 ```
 
 
 
-old below
-```
-# Create a private key: https://docs.mcuboot.com/readme-zephyr.html
-python ./bootloader/mcuboot/scripts/imgtool.py keygen -k private.pem -t rsa-2048
 
-# Create its public key
+## Set up crypto
+```sh
+python bootloader/mcuboot/scripts/imgtool.py keygen -k private.pem -t rsa-2048
+
 openssl rsa -in private.pem -pubout > public.pem
+```
 
-# Set up signing: https://docs.mcuboot.com/readme-zephyr.html
+
-# ./bootloader/mcuboot/samples/zephyr/Makefile
+
+
+## Build the firmware
+
+```sh
+west build -p always -b nucleo_g431rb -d build_mcuboot bootloader/mcuboot/boot/zephyr --
+
+west build -p always -b nucleo_g431rb -d build_fast zephyr/samples/basic/blinky
+
+west build -p always -b nucleo_g431rb -d build_slow zephyr/samples/basic/blinkyslow
+```
+
+
+## Sign the firmware
+```sh
 python bootloader/mcuboot/scripts/imgtool.py sign \
-    --key mykey.pem \
+    --key private.pem \
     --header-size 0x200 \
+    --pad-header \
     --align 8 \
+	--pad \
     --version 1.2 \
-    --slot-size 0x8000 \
+    --slot-size 0xA000 \
-    ./
+    build_fast/zephyr/zephyr.bin \
+    blinky-signed.bin
 
+python bootloader/mcuboot/scripts/imgtool.py sign \
+    --key private.pem \
+    --header-size 0x200 \
+    --pad-header \
+    --align 8 \
+	--pad \
+    --version 1.2 \
+    --slot-size 0xA000 \
+    build_slow/zephyr/zephyr.bin \
+    blinkyslow-signed.bin
+```
 
-# Add the key file path to the KConfig https://docs.zephyrproject.org/latest/build/kconfig/setting.html
+## Flash the firmware
-echo "
 
-# Set the key file
+`su root` allows flashing to usb devices, run  `nix develop` again if using it.
-CONFIG_BOOT_SIGNATURE_KEY_FILE=public.pem" >> "./zephyr/boards/st/nucleo_g431rb/nucleo_g431rb_defconfig"
+
+`flash0@0x08000000` in `zephyr/dts/arm/st/g4/stm32g4.dtsi`
+```sh
+pyocd flash -t stm32g431rbtx build_mcuboot/zephyr/zephyr.hex
+pyocd flash -t stm32g431rbtx --base-address 0x0800C000 blinky-signed.bin
+pyocd flash -t stm32g431rbtx --base-address 0x08016000 blinkyslow-signed.bin
+```
 
 
 
-west build -p always -b nucleo_g431rb bootloader/mcuboot/boot/zephyr -d build/mcuboot -- -DEXTRA_CONF_FILE=mcuboot-nucleo-g431rb.conf
-west flash -d build/mcuboot --runner pyocd # (as root, with nix develop)
-
-cd zephyr
-# Package 1
-west build -p always -b nucleo_g431rb samples/basic/blinky -d build/app -- -DCONFIG_BOOTLOADER_MCUBOOT=y -DCONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE=y
-west flash -d build/app --runner pyocd  # (as root, with nix develop)
-
-# Package 2
-west build -p always -b nucleo_g431rb samples/basic/blinkyslow -d build/blinkyslow -- -DCONFIG_BOOTLOADER_MCUBOOT=y -DCONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE=y
-pyocd flash --target stm32g431rbtx --base-address 0x08014800  build/blinkyslow/zephyr/zephyr.signed.hex
-```

zephyrproject/build/mcuboot/CMakeCache.txt

@@ -32,6 +32,15 @@ BOARD_DIR:PATH=/home/jeremy/utat-dev/zephyrproject/zephyr/boards/st/nucleo_g431r
 //Path to a program.
 BOSSAC:FILEPATH=/nix/store/nszfwxgy1r73svjq0ywnr3gf9xyyp1hs-zephyr-sdk-hosttools-1.0.1/bin/bossac
 
+//Kernel binary file
+BYPRODUCT_KERNEL_BIN_NAME:FILEPATH=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/zephyr/zephyr.bin
+
+//Kernel elf file
+BYPRODUCT_KERNEL_ELF_NAME:FILEPATH=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/zephyr/zephyr.elf
+
+//Kernel hex file
+BYPRODUCT_KERNEL_HEX_NAME:FILEPATH=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/zephyr/zephyr.hex
+
 //Selected board
 CACHED_BOARD:STRING=nucleo_g431rb
 
@@ -45,7 +54,123 @@ CACHED_SNIPPET:STRING=
 CCACHE_FOUND:FILEPATH=CCACHE_FOUND-NOTFOUND
 
 //Path to a program.
-CMAKE_C_COMPILER:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc
+CCACHE_PROGRAM:FILEPATH=CCACHE_PROGRAM-NOTFOUND
+
+//Path to a program.
+CMAKE_ADDR2LINE:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-addr2line
+
+//Path to a program.
+CMAKE_AR:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-ar
+
+//Path to a program.
+CMAKE_AS:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-as
+
+//ASM compiler
+CMAKE_ASM_COMPILER:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_ASM_COMPILER_AR:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ar
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_ASM_COMPILER_RANLIB:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ranlib
+
+//Flags used by the ASM compiler during all build types.
+CMAKE_ASM_FLAGS:STRING=
+
+//Flags used by the ASM compiler during DEBUG builds.
+CMAKE_ASM_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the ASM compiler during MINSIZEREL builds.
+CMAKE_ASM_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the ASM compiler during RELEASE builds.
+CMAKE_ASM_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the ASM compiler during RELWITHDEBINFO builds.
+CMAKE_ASM_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//Choose the type of build, options are: None Debug Release RelWithDebInfo
+// MinSizeRel ...
+CMAKE_BUILD_TYPE:STRING=
+
+//CXX compiler
+CMAKE_CXX_COMPILER:STRING=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-g++
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_CXX_COMPILER_AR:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ar
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ranlib
+
+//Flags used by the CXX compiler during all build types.
+CMAKE_CXX_FLAGS:STRING=
+
+//Flags used by the CXX compiler during DEBUG builds.
+CMAKE_CXX_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the CXX compiler during MINSIZEREL builds.
+CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the CXX compiler during RELEASE builds.
+CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the CXX compiler during RELWITHDEBINFO builds.
+CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//C compiler
+CMAKE_C_COMPILER:STRING=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_AR:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ar
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_RANLIB:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc-ranlib
+
+//Flags used by the C compiler during all build types.
+CMAKE_C_FLAGS:STRING=
+
+//Flags used by the C compiler during DEBUG builds.
+CMAKE_C_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the C compiler during MINSIZEREL builds.
+CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the C compiler during RELEASE builds.
+CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the C compiler during RELWITHDEBINFO builds.
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//Path to a program.
+CMAKE_DLLTOOL:FILEPATH=CMAKE_DLLTOOL-NOTFOUND
+
+//Flags used by the linker during all build types.
+CMAKE_EXE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during DEBUG builds.
+CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during MINSIZEREL builds.
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during RELEASE builds.
+CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during RELWITHDEBINFO builds.
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Enable/Disable output of build database during the build.
+CMAKE_EXPORT_BUILD_DATABASE:BOOL=
+
+//Export CMake compile commands. Used by gen_app_partitions.py
+// script
+CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE
 
 //Value Computed by CMake.
 CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/CMakeFiles/pkgRedirects
@@ -53,6 +178,183 @@ CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/buil
 //Path to a program.
 CMAKE_GCOV:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcov
 
+//Path to a program.
+CMAKE_GDB:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-gdb-py
+
+//User executables (bin)
+CMAKE_INSTALL_BINDIR:PATH=bin
+
+//Read-only architecture-independent data (DATAROOTDIR)
+CMAKE_INSTALL_DATADIR:PATH=
+
+//Read-only architecture-independent data root (share)
+CMAKE_INSTALL_DATAROOTDIR:PATH=share
+
+//Documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+CMAKE_INSTALL_DOCDIR:PATH=
+
+//C header files (include)
+CMAKE_INSTALL_INCLUDEDIR:PATH=include
+
+//Info documentation (DATAROOTDIR/info)
+CMAKE_INSTALL_INFODIR:PATH=
+
+CMAKE_INSTALL_LIBDIR:PATH=lib
+
+//Program executables (libexec)
+CMAKE_INSTALL_LIBEXECDIR:PATH=libexec
+
+//Locale-dependent data (DATAROOTDIR/locale)
+CMAKE_INSTALL_LOCALEDIR:PATH=
+
+//Modifiable single-machine data (var)
+CMAKE_INSTALL_LOCALSTATEDIR:PATH=var
+
+//Man documentation (DATAROOTDIR/man)
+CMAKE_INSTALL_MANDIR:PATH=
+
+//C header files for non-gcc (/usr/include)
+CMAKE_INSTALL_OLDINCLUDEDIR:PATH=/usr/include
+
+//Install path prefix, prepended onto install directories.
+CMAKE_INSTALL_PREFIX:PATH=/usr/local
+
+//Run-time variable data (LOCALSTATEDIR/run)
+CMAKE_INSTALL_RUNSTATEDIR:PATH=
+
+//System admin executables (sbin)
+CMAKE_INSTALL_SBINDIR:PATH=sbin
+
+//Modifiable architecture-independent data (com)
+CMAKE_INSTALL_SHAREDSTATEDIR:PATH=com
+
+//Read-only single-machine data (etc)
+CMAKE_INSTALL_SYSCONFDIR:PATH=etc
+
+//Program used to build from build.ninja files.
+CMAKE_MAKE_PROGRAM:FILEPATH=/nix/store/fx65xy1jiapn94i0gkq62k4vbvvbqyx1-ninja-1.13.1/bin/ninja
+
+//Flags used by the linker during the creation of modules during
+// all build types.
+CMAKE_MODULE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during the creation of modules during
+// DEBUG builds.
+CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during the creation of modules during
+// MINSIZEREL builds.
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during the creation of modules during
+// RELEASE builds.
+CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during the creation of modules during
+// RELWITHDEBINFO builds.
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_NM:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-nm
+
+//Path to a program.
+CMAKE_OBJCOPY:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-objcopy
+
+//Path to a program.
+CMAKE_OBJDUMP:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-objdump
+
+//Value Computed by CMake
+CMAKE_PROJECT_COMPAT_VERSION:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_DESCRIPTION:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_NAME:STATIC=MCUboot
+
+//Value Computed by CMake
+CMAKE_PROJECT_VERSION:STATIC=4.4.99
+
+//Value Computed by CMake
+CMAKE_PROJECT_VERSION_MAJOR:STATIC=4
+
+//Value Computed by CMake
+CMAKE_PROJECT_VERSION_MINOR:STATIC=4
+
+//Value Computed by CMake
+CMAKE_PROJECT_VERSION_PATCH:STATIC=99
+
+//Value Computed by CMake
+CMAKE_PROJECT_VERSION_TWEAK:STATIC=
+
+//Path to a program.
+CMAKE_RANLIB:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-ranlib
+
+//Path to a program.
+CMAKE_READELF:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-readelf
+
+//Flags used by the linker during the creation of shared libraries
+// during all build types.
+CMAKE_SHARED_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during DEBUG builds.
+CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during MINSIZEREL builds.
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during RELEASE builds.
+CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during RELWITHDEBINFO builds.
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//If set, runtime paths are not added when installing shared libraries,
+// but are added when building.
+CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
+
+//If set, runtime paths are not added when using shared libraries.
+CMAKE_SKIP_RPATH:BOOL=NO
+
+//Flags used by the archiver during the creation of static libraries
+// during all build types.
+CMAKE_STATIC_LINKER_FLAGS:STRING=
+
+//Flags used by the archiver during the creation of static libraries
+// during DEBUG builds.
+CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the archiver during the creation of static libraries
+// during MINSIZEREL builds.
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the archiver during the creation of static libraries
+// during RELEASE builds.
+CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the archiver during the creation of static libraries
+// during RELWITHDEBINFO builds.
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_STRIP:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/bin/arm-zephyr-eabi-strip
+
+//Path to a program.
+CMAKE_TAPI:FILEPATH=CMAKE_TAPI-NOTFOUND
+
+//If this value is on, makefiles will be generated without the
+// .SILENT directive, and all commands will be echoed to the console
+// during the make.  This is useful for debugging only. With Visual
+// Studio IDE projects all commands are done without /nologo.
+CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
+
 //If desired, you can build the application usingthe configuration
 // settings specified in an alternate .conf file using this parameter.
 // These settings will override the settings in the application’s
@@ -62,6 +364,9 @@ CMAKE_GCOV:FILEPATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1
 // CONF_FILE, use the CONF_FILE variable.
 CONF_FILE:STRING=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/prj.conf
 
+//Disable package configuration, target export and installation
+DISABLE_PACKAGE_CONFIG_AND_INSTALL:BOOL=ON
+
 //Path to a program.
 DTC:FILEPATH=/nix/store/nszfwxgy1r73svjq0ywnr3gf9xyyp1hs-zephyr-sdk-hosttools-1.0.1/bin/dtc
 
@@ -72,8 +377,14 @@ DTC:FILEPATH=/nix/store/nszfwxgy1r73svjq0ywnr3gf9xyyp1hs-zephyr-sdk-hosttools-1.
 // dts2.overlay"
 DTC_OVERLAY_FILE:STRING=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/app.overlay
 
-//No help, variable specified on the command line.
+//Path to a program.
-EXTRA_CONF_FILE:UNINITIALIZED=mcuboot-nucleo-g431rb.conf
+GEN_KOBJECT_LIST:FILEPATH=/home/jeremy/utat-dev/zephyrproject/zephyr/scripts/build/gen_kobject_list.py
+
+//Linker BFD compatibility (compiler reported)
+GNULD_LINKER_IS_BFD:BOOL=ON
+
+//GNU ld version
+GNULD_VERSION_STRING:STRING=2.43.1
 
 //Path to a program.
 GPERF:FILEPATH=GPERF-NOTFOUND
@@ -81,12 +392,98 @@ GPERF:FILEPATH=GPERF-NOTFOUND
 //Path to a program.
 IMGTOOL:FILEPATH=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/scripts/imgtool.py
 
+//Install Mbed TLS headers.
+INSTALL_MBEDTLS_HEADERS:BOOL=ON
+
+//Install TF PSA Crypto headers.
+INSTALL_TF_PSA_CRYPTO_HEADERS:BOOL=ON
+
+//Explicitly link Mbed TLS library to pthread.
+LINK_WITH_PTHREAD:BOOL=OFF
+
+//Explicitly link Mbed TLS library to trusted_storage.
+LINK_WITH_TRUSTED_STORAGE:BOOL=OFF
+
+//Mbed TLS config file (overrides default).
+MBEDTLS_CONFIG_FILE:FILEPATH=
+
+//Compiler warnings treated as errors
+MBEDTLS_FATAL_WARNINGS:BOOL=ON
+
+//Mbed TLS user config file (appended to default).
+MBEDTLS_USER_CONFIG_FILE:FILEPATH=
+
+//Value Computed by CMake
+MCUboot_BINARY_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot
+
+//Value Computed by CMake
+MCUboot_IS_TOP_LEVEL:STATIC=ON
+
+//Value Computed by CMake
+MCUboot_SOURCE_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr
+
+//Build the libraries with /MT compiler flag
+MSVC_STATIC_RUNTIME:BOOL=OFF
+
+//Value Computed by CMake
+Mbed TLS_BINARY_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/modules/mbedtls/mbedtls
+
+//Value Computed by CMake
+Mbed TLS_IS_TOP_LEVEL:STATIC=OFF
+
+//Value Computed by CMake
+Mbed TLS_SOURCE_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/modules/crypto/mbedtls
+
 //Path to a program.
 OPENOCD:FILEPATH=/nix/store/nszfwxgy1r73svjq0ywnr3gf9xyyp1hs-zephyr-sdk-hosttools-1.0.1/bin/openocd
 
+//Path to a program.
+PAHOLE:FILEPATH=PAHOLE-NOTFOUND
+
 //Path to a program.
 PTY_INTERFACE:FILEPATH=PTY_INTERFACE-NOTFOUND
 
+//Path to a program.
+PUNCOVER:FILEPATH=PUNCOVER-NOTFOUND
+
+//Value Computed by CMake
+Picolibc_BINARY_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/modules/picolibc
+
+//Value Computed by CMake
+Picolibc_IS_TOP_LEVEL:STATIC=OFF
+
+//Value Computed by CMake
+Picolibc_SOURCE_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/modules/lib/picolibc
+
+//Path to the SoC directory.
+SOC_FULL_DIR:PATH=/home/jeremy/utat-dev/zephyrproject/zephyr/soc/st/stm32
+
+//Value Computed by CMake
+TF-PSA-Crypto_BINARY_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/modules/mbedtls/mbedtls/tf-psa-crypto
+
+//Value Computed by CMake
+TF-PSA-Crypto_IS_TOP_LEVEL:STATIC=OFF
+
+//Value Computed by CMake
+TF-PSA-Crypto_SOURCE_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/modules/crypto/tf-psa-crypto
+
+//TF-PSA-Crypto config file (overrides default).
+TF_PSA_CRYPTO_CONFIG_FILE:FILEPATH=
+
+//Name of the configuration to use (see config.py documentation)
+TF_PSA_CRYPTO_CONFIG_NAME:STRING=
+
+//Compiler warnings treated as errors
+TF_PSA_CRYPTO_FATAL_WARNINGS:BOOL=ON
+
+TF_PSA_CRYPTO_TARGET_PREFIX:STRING=
+
+//Build TF-PSA-Crypto test driver for driver dispatch testing
+TF_PSA_CRYPTO_TEST_DRIVER:BOOL=OFF
+
+//TF-PSA-Crypto user config file (appended to default).
+TF_PSA_CRYPTO_USER_CONFIG_FILE:FILEPATH=
+
 //True if toolchain supports libstdc++
 TOOLCHAIN_HAS_GLIBCXX:BOOL=ON
 
@@ -102,15 +499,39 @@ TOOLCHAIN_ROOT:STRING=/home/jeremy/utat-dev/zephyrproject/zephyr
 //compiler used by the toolchain variant
 TOOLCHAIN_VARIANT_COMPILER:STRING=gnu
 
+//Build Mbed TLS shared library.
+USE_SHARED_MBEDTLS_LIBRARY:BOOL=OFF
+
+//Build TF-PSA-Crypto shared library.
+USE_SHARED_TF_PSA_CRYPTO_LIBRARY:BOOL=OFF
+
+//Build Mbed TLS static library.
+USE_STATIC_MBEDTLS_LIBRARY:BOOL=ON
+
+//Build TF-PSA-Crypto static library.
+USE_STATIC_TF_PSA_CRYPTO_LIBRARY:BOOL=ON
+
 //No help, variable specified on the command line.
 WEST_PYTHON:UNINITIALIZED=/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/bin/python3.13
 
 //Zephyr base
 ZEPHYR_BASE:PATH=/home/jeremy/utat-dev/zephyrproject/zephyr
 
+//Path to Zephyr git repository index file
+ZEPHYR_GIT_INDEX:PATH=/home/jeremy/utat-dev/zephyrproject/zephyr/.git/index
+
 //Zephyr toolchain variant
 ZEPHYR_TOOLCHAIN_VARIANT:STRING=zephyr
 
+//Value Computed by CMake
+Zephyr-Kernel_BINARY_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/build/mcuboot
+
+//Value Computed by CMake
+Zephyr-Kernel_IS_TOP_LEVEL:STATIC=ON
+
+//Value Computed by CMake
+Zephyr-Kernel_SOURCE_DIR:STATIC=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr
+
 //The directory containing a CMake configuration file for Zephyr-sdk.
 Zephyr-sdk_DIR:PATH=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/cmake
 
@@ -132,6 +553,27 @@ Zephyr_DIR:PATH=/home/jeremy/utat-dev/zephyrproject/zephyr/share/zephyr-package/
 BOARD_DIRECTORIES:INTERNAL=/home/jeremy/utat-dev/zephyrproject/zephyr/boards/st/nucleo_g431rb
 //DT bindings root directories
 CACHED_DTS_ROOT_BINDINGS:INTERNAL=/home/jeremy/utat-dev/zephyrproject/zephyr/dts/bindings
+//ADVANCED property for variable: CMAKE_ADDR2LINE
+CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_AR
+CMAKE_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_COMPILER
+CMAKE_ASM_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_COMPILER_AR
+CMAKE_ASM_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_COMPILER_RANLIB
+CMAKE_ASM_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+CMAKE_ASM_COMPILER_WORKS:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_FLAGS
+CMAKE_ASM_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_FLAGS_DEBUG
+CMAKE_ASM_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_FLAGS_MINSIZEREL
+CMAKE_ASM_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_FLAGS_RELEASE
+CMAKE_ASM_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_ASM_FLAGS_RELWITHDEBINFO
+CMAKE_ASM_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
 CMAKE_CACHEFILE_DIR:INTERNAL=/home/jeremy/utat-dev/zephyrproject/build/mcuboot
 //Major version of cmake used to create the current loaded cache
@@ -146,6 +588,54 @@ CMAKE_COMMAND:INTERNAL=/nix/store/2xyd9pnqzg74a9xlayi54d2bcy1844n5-cmake-4.1.2/b
 CMAKE_CPACK_COMMAND:INTERNAL=/nix/store/2xyd9pnqzg74a9xlayi54d2bcy1844n5-cmake-4.1.2/bin/cpack
 //Path to ctest program executable.
 CMAKE_CTEST_COMMAND:INTERNAL=/nix/store/2xyd9pnqzg74a9xlayi54d2bcy1844n5-cmake-4.1.2/bin/ctest
+//ADVANCED property for variable: CMAKE_CXX_COMPILER
+CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
+CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB
+CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS
+CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
+CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
+CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
+CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
+CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER
+CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_AR
+CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB
+CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS
+CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
+CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
+CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
+CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_DLLTOOL
+CMAKE_DLLTOOL-ADVANCED:INTERNAL=1
+//Executable file format
+CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
+CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXPORT_BUILD_DATABASE
+CMAKE_EXPORT_BUILD_DATABASE-ADVANCED:INTERNAL=1
 //Name of external makefile project generator.
 CMAKE_EXTRA_GENERATOR:INTERNAL=
 //Name of generator.
@@ -159,25 +649,123 @@ CMAKE_GENERATOR_TOOLSET:INTERNAL=
 //Source directory with the top level CMakeLists.txt file for this
 // project
 CMAKE_HOME_DIRECTORY:INTERNAL=/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr
+//ADVANCED property for variable: CMAKE_INSTALL_BINDIR
+CMAKE_INSTALL_BINDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_DATADIR
+CMAKE_INSTALL_DATADIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_DATAROOTDIR
+CMAKE_INSTALL_DATAROOTDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_DOCDIR
+CMAKE_INSTALL_DOCDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_INCLUDEDIR
+CMAKE_INSTALL_INCLUDEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_INFODIR
+CMAKE_INSTALL_INFODIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_LIBDIR
+CMAKE_INSTALL_LIBDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_LIBEXECDIR
+CMAKE_INSTALL_LIBEXECDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_LOCALEDIR
+CMAKE_INSTALL_LOCALEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_LOCALSTATEDIR
+CMAKE_INSTALL_LOCALSTATEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_MANDIR
+CMAKE_INSTALL_MANDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_OLDINCLUDEDIR
+CMAKE_INSTALL_OLDINCLUDEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_RUNSTATEDIR
+CMAKE_INSTALL_RUNSTATEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_SBINDIR
+CMAKE_INSTALL_SBINDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_SHAREDSTATEDIR
+CMAKE_INSTALL_SHAREDSTATEDIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_INSTALL_SYSCONFDIR
+CMAKE_INSTALL_SYSCONFDIR-ADVANCED:INTERNAL=1
 //Name of CMakeLists files to read
 CMAKE_LIST_FILE_NAME:INTERNAL=CMakeLists.txt
+//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
+CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
+CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_NM
+CMAKE_NM-ADVANCED:INTERNAL=1
 //number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=171
+//ADVANCED property for variable: CMAKE_OBJCOPY
+CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_OBJDUMP
+CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
+//Platform information initialized
+CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_RANLIB
+CMAKE_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_READELF
+CMAKE_READELF-ADVANCED:INTERNAL=1
 //Path to CMake installation.
 CMAKE_ROOT:INTERNAL=/nix/store/2xyd9pnqzg74a9xlayi54d2bcy1844n5-cmake-4.1.2/share/cmake-4.1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
+CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
+CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_RPATH
+CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
+CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
+CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
+CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STRIP
+CMAKE_STRIP-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_TAPI
+CMAKE_TAPI-ADVANCED:INTERNAL=1
+//uname command
+CMAKE_UNAME:INTERNAL=/nix/store/hqkszxk2c0cxvd04xa4gsaqs182dw8l2-coreutils-9.8/bin/uname
+//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
+CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//Test C_COMPILER_SUPPORTS_WFORMAT_SIGNEDNESS
+C_COMPILER_SUPPORTS_WFORMAT_SIGNEDNESS:INTERNAL=1
 //Details about finding Dtc
 FIND_PACKAGE_MESSAGE_DETAILS_Dtc:INTERNAL=[/nix/store/nszfwxgy1r73svjq0ywnr3gf9xyyp1hs-zephyr-sdk-hosttools-1.0.1/bin/dtc][v1.7.0(1.4.6)]
+//Details about finding GnuLd
+FIND_PACKAGE_MESSAGE_DETAILS_GnuLd:INTERNAL=[/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1/gnu/arm-zephyr-eabi/arm-zephyr-eabi/bin/ld.bfd][v2.43.1()]
 //Details about finding Python3
-FIND_PACKAGE_MESSAGE_DETAILS_Python3:INTERNAL=[/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/bin/python3.13][found components: Interpreter ][v3.13.12(3.12)]
+FIND_PACKAGE_MESSAGE_DETAILS_Python3:INTERNAL=[/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/bin/python3.13][found components: Interpreter ][v3.13.12()]
 //Zephyr hardware model version
 HWM:INTERNAL=v2
 //Zephyr hardware model
 HWMv2:INTERNAL=True
+KERNEL_META_PATH:INTERNAL=/home/jeremy/utat-dev/zephyrproject/build/mcuboot/zephyr/zephyr.meta
+//List of SoC directories for SoC (stm32g431xx)
+SOC_DIRECTORIES:INTERNAL=/home/jeremy/utat-dev/zephyrproject/zephyr/soc/st/stm32
+SOC_LINKER_SCRIPT:INTERNAL=/home/jeremy/utat-dev/zephyrproject/zephyr/include/zephyr/arch/arm/cortex_m/scripts/linker.ld
 //West
 WEST:INTERNAL=/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/bin/python3.13;-m;west
 //Cached environment variable ZEPHYR_SDK_INSTALL_DIR
 ZEPHYR_SDK_INSTALL_DIR:INTERNAL=/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1
 ZEPHYR_SHARED_TARGETS:INTERNAL=menuconfig;guiconfig;hardenconfig;traceconfig
+//CMAKE_INSTALL_PREFIX during last run
+_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX:INTERNAL=/usr/local
 //Compiler reason failure
 _Python3_Compiler_REASON_FAILURE:INTERNAL=
 //Development reason failure
@@ -186,6 +774,8 @@ _Python3_EXECUTABLE:INTERNAL=/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3
 //Python3 Properties
 _Python3_INTERPRETER_PROPERTIES:INTERNAL=Python;3;13;12;64;<none>;cpython-313-x86_64-linux-gnu.so;abi3;/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/lib/python3.13;/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/lib/python3.13;/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/lib/python3.13/site-packages;/nix/store/ibzxfw7gxwzqz2x8dyh3a2h32r1v87wn-python3-3.13.12-env/lib/python3.13/site-packages
 _Python3_INTERPRETER_SIGNATURE:INTERNAL=bd148e763204f8b34af6123aa3404726
+//Interpreter reason failure
+_Python3_Interpreter_REASON_FAILURE:INTERNAL=
 //NumPy reason failure
 _Python3_NumPy_REASON_FAILURE:INTERNAL=
 

zephyrproject/build/mcuboot/build_info.yml

@@ -1,6 +1,62 @@
+cmake:
+  application:
+    configuration-dir: '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr'
+    source-dir: '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr'
+  board:
+    name: 'nucleo_g431rb'
+    path:
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/boards/st/nucleo_g431rb'
+    qualifiers: 'stm32g431xx'
+    revision: ''
+  devicetree:
+    bindings-dirs:
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/bindings'
+    files:
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts'
+     - '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/app.overlay'
+    include-dirs:
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/ambiq/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/atmel/include'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/bouffalolab/include'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/bouffalolab/include/zephyr'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/gigadevice/include'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/microchip/include'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/microchip/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/nuvoton/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/nxp/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/stm32/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/modules/hal/ti/dts'
+     - '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/include'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/include'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/include/zephyr'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/common'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/vendor'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/rx'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/x86'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/xtensa'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/sparc'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/riscv'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/posix'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/arm64'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/arm'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts/arc'
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/dts'
+    user-files:
+     - '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/app.overlay'
+  kconfig:
+    files:
+     - '/home/jeremy/utat-dev/zephyrproject/zephyr/boards/st/nucleo_g431rb/nucleo_g431rb_defconfig'
+     - '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/prj.conf'
+    user-files:
+     - '/home/jeremy/utat-dev/zephyrproject/bootloader/mcuboot/boot/zephyr/prj.conf'
+  toolchain:
+    name: 'zephyr'
+    path: '/nix/store/jc8rrlxa357m23f36nknc61ns5ajm114-zephyr-sdk-1.0.1'
+  zephyr:
+    version: '4.4.99'
+    zephyr-base: '/home/jeremy/utat-dev/zephyrproject/zephyr'
+version: '0.1.0'
 west:
-  command: /nix/store/1hhzbgg5hqhpw2c3gk98myzr6fjlfcja-python3.13-west-1.5.0/bin/west
+  command: '/nix/store/1hhzbgg5hqhpw2c3gk98myzr6fjlfcja-python3.13-west-1.5.0/bin/west build -p always -b nucleo_g431rb bootloader/mcuboot/boot/zephyr -d build/mcuboot'
-    build -p always -b nucleo_g431rb bootloader/mcuboot/boot/zephyr -d build/mcuboot
+  topdir: '/home/jeremy/utat-dev/zephyrproject'
-    -- -DEXTRA_CONF_FILE=mcuboot-nucleo-g431rb.conf
+  version: '1.5.0'
-  topdir: /home/jeremy/utat-dev/zephyrproject
-  version: 1.5.0

zephyrproject/build/mcuboot/zephyr/edt.pickle.cmake

@@ -180,7 +180,7 @@ set_target_properties(${DEVICETREE_TARGET}
     "DT_NODELABEL|boot_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@0"
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|label" "mcuboot"
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|read-only" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|reg" "0;32768"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|reg" "0;49152"
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|compatible" "zephyr,mapped-partition"
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|dma-coherent" "False"
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|zephyr,deferred-init" "False"
@@ -188,50 +188,50 @@ set_target_properties(${DEVICETREE_TARGET}
     "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|zephyr,pm-device-runtime-auto" "False"
     "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|NUM" "1"
     "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|ADDR" "0x8000000"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|SIZE" "0x8000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0|SIZE" "0xc000"
     "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@0" "0x8000000"
-    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800" TRUE
+    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000" TRUE
-    "DT_NODELABEL|slot0_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800"
+    "DT_NODELABEL|slot0_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|label" "image-0"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|label" "image-0"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|read-only" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|read-only" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|reg" "32768;65536"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|reg" "49152;81920"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|compatible" "zephyr,mapped-partition"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|compatible" "zephyr,mapped-partition"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|dma-coherent" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|dma-coherent" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|zephyr,deferred-init" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|zephyr,deferred-init" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|wakeup-source" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|wakeup-source" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|zephyr,pm-device-runtime-auto" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|zephyr,pm-device-runtime-auto" "False"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|NUM" "1"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|NUM" "1"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|ADDR" "0x8008000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|ADDR" "0x800c000"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800|SIZE" "0x10000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000|SIZE" "0x14000"
-    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800" "0x8008800"
+    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000" "0x800c000"
-    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800" TRUE
+    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000" TRUE
-    "DT_NODELABEL|slot1_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800"
+    "DT_NODELABEL|slot1_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|label" "image-1"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|label" "image-1"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|read-only" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|read-only" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|reg" "65536;98304"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|reg" "81920;114688"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|compatible" "zephyr,mapped-partition"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|compatible" "zephyr,mapped-partition"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|dma-coherent" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|dma-coherent" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|zephyr,deferred-init" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|zephyr,deferred-init" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|wakeup-source" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|wakeup-source" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|zephyr,pm-device-runtime-auto" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|zephyr,pm-device-runtime-auto" "False"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|NUM" "1"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|NUM" "1"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|ADDR" "0x8010000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|ADDR" "0x8014000"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800|SIZE" "0x18000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000|SIZE" "0x1c000"
-    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800" "0x8014800"
+    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000" "0x8014000"
-    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000" TRUE
+    "DT_NODE|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000" TRUE
-    "DT_NODELABEL|storage_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000"
+    "DT_NODELABEL|storage_partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|label" "storage"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|label" "storage"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|read-only" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|read-only" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|reg" "98304;131072"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|reg" "114688;131072"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|compatible" "zephyr,mapped-partition"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|compatible" "zephyr,mapped-partition"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|dma-coherent" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|dma-coherent" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|zephyr,deferred-init" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|zephyr,deferred-init" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|wakeup-source" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|wakeup-source" "False"
-    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|zephyr,pm-device-runtime-auto" "False"
+    "DT_PROP|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|zephyr,pm-device-runtime-auto" "False"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|NUM" "1"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|NUM" "1"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|ADDR" "0x8018000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|ADDR" "0x801c000"
-    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000|SIZE" "0x20000"
+    "DT_REG|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000|SIZE" "0x20000"
-    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000" "0x801f000"
+    "DT_UNIT_ADDR|/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000" "0x801c000"
     "DT_NODE|/soc/flash-controller@40022000/flash@1fff7000" TRUE
     "DT_NODELABEL|st_nvm_user_otp" "/soc/flash-controller@40022000/flash@1fff7000"
     "DT_PROP|/soc/flash-controller@40022000/flash@1fff7000|reg" "536834048;1024"
@@ -2120,7 +2120,7 @@ set_target_properties(${DEVICETREE_TARGET}
     "DT_COMP|st,stm32g4-flash-controller" "/soc/flash-controller@40022000"
     "DT_COMP|st,stm32-nv-flash" "/soc/flash-controller@40022000/flash@8000000"
     "DT_COMP|soc-nv-flash" "/soc/flash-controller@40022000/flash@8000000"
-    "DT_COMP|zephyr,mapped-partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@0;/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800;/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800;/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000"
+    "DT_COMP|zephyr,mapped-partition" "/soc/flash-controller@40022000/flash@8000000/partitions/partition@0;/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000;/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000;/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000"
     "DT_COMP|st,stm32-nvm-otp" "/soc/flash-controller@40022000/flash@1fff7000;/soc/flash-controller@40022000/flash@1fff7500"
     "DT_COMP|fixed-layout" "/soc/flash-controller@40022000/flash@1fff7500/nvmem-layout"
     "DT_COMP|st,stm32-rcc" "/soc/rcc@40021000"

zephyrproject/build/mcuboot/zephyr/zephyr.dts

@@ -100,9 +100,9 @@
 			reg = < 0x50000800 0x400 >;     /* in zephyr/dts/arm/st/g4/stm32g4.dtsi:149 */
 			clocks = < &rcc 0x4c 0x10000 >; /* in zephyr/dts/arm/st/g4/stm32g4.dtsi:150 */
 			#io-channel-cells = < 0x1 >;    /* in zephyr/dts/arm/st/g4/stm32g4.dtsi:152 */
-			status = "okay";                /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:205 */
+			status = "okay";                /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:204 */
-			pinctrl-0 = < &dac1_out1_pa4 >; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:206 */
+			pinctrl-0 = < &dac1_out1_pa4 >; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:205 */
-			pinctrl-names = "default";      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:207 */
+			pinctrl-names = "default";      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:206 */
 		};
 
 		/* node '/soc/dac@50001000' defined in zephyr/dts/arm/st/g4/stm32g4.dtsi:155 */
@@ -147,28 +147,28 @@
 					boot_partition: partition@0 {
 						compatible = "zephyr,mapped-partition"; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:174 */
 						label = "mcuboot";                      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:175 */
-						reg = < 0x0 0x8000 >;                   /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:176 */
+						reg = < 0x0 0xc000 >;                   /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:176 */
 					};
 
-					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@8800' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:179 */
+					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@c000' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:179 */
-					slot0_partition: partition@8800 {
+					slot0_partition: partition@c000 {
 						compatible = "zephyr,mapped-partition"; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:180 */
 						label = "image-0";                      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:181 */
-						reg = < 0x8000 0x10000 >;               /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:182 */
+						reg = < 0xc000 0x14000 >;               /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:182 */
 					};
 
-					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@14800' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:185 */
+					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@14000' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:185 */
-					slot1_partition: partition@14800 {
+					slot1_partition: partition@14000 {
 						compatible = "zephyr,mapped-partition"; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:186 */
 						label = "image-1";                      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:187 */
-						reg = < 0x10000 0x18000 >;              /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:188 */
+						reg = < 0x14000 0x1c000 >;              /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:188 */
 					};
 
-					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@1f000' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:192 */
+					/* node '/soc/flash-controller@40022000/flash@8000000/partitions/partition@1c000' defined in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:191 */
-					storage_partition: partition@1f000 {
+					storage_partition: partition@1c000 {
-						compatible = "zephyr,mapped-partition"; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:193 */
+						compatible = "zephyr,mapped-partition"; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:192 */
-						label = "storage";                      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:194 */
+						label = "storage";                      /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:193 */
-						reg = < 0x18000 0x20000 >;              /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:195 */
+						reg = < 0x1c000 0x20000 >;              /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:194 */
 					};
 				};
 			};
@@ -349,7 +349,7 @@
 			/* node '/soc/pin-controller@48000000/dac1_out1_pa4' defined in modules/hal/stm32/dts/st/g4/stm32g431r(6-8-b)tx-pinctrl.dtsi:461 */
 			dac1_out1_pa4: dac1_out1_pa4 {
 				pinmux = < 0x90 >; /* in modules/hal/stm32/dts/st/g4/stm32g431r(6-8-b)tx-pinctrl.dtsi:462 */
-				phandle = < 0x3 >; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:206 */
+				phandle = < 0x3 >; /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:205 */
 			};
 
 			/* node '/soc/pin-controller@48000000/i2c1_scl_pb8' defined in modules/hal/stm32/dts/st/g4/stm32g431r(6-8-b)tx-pinctrl.dtsi:503 */
@@ -553,7 +553,7 @@
 		iwdg: watchdog@40003000 {
 			compatible = "st,stm32-watchdog"; /* in zephyr/dts/arm/st/g4/stm32g4.dtsi:357 */
 			reg = < 0x40003000 0x400 >;       /* in zephyr/dts/arm/st/g4/stm32g4.dtsi:358 */
-			status = "okay";                  /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:201 */
+			status = "okay";                  /* in zephyr/boards/st/nucleo_g431rb/nucleo_g431rb.dts:200 */
 		};
 
 		/* node '/soc/watchdog@40002c00' defined in zephyr/dts/arm/st/g4/stm32g4.dtsi:362 */

zephyrproject/build/mcuboot/zephyr/zephyr.dts.pre

@@ -3099,26 +3099,25 @@ stm32_lp_tick_source: &lptim1 {
   boot_partition: partition@0 {
    compatible = "zephyr,mapped-partition";
    label = "mcuboot";
-   reg = <0x00000000 0x00008000>;
+   reg = <0x00000000 0x0000C000>;
   };
 
-  slot0_partition: partition@8800 {
+  slot0_partition: partition@C000 {
    compatible = "zephyr,mapped-partition";
    label = "image-0";
-   reg = <0x00008000 0x00010000>;
+   reg = <0x0000C000 0x00014000>;
   };
 
-  slot1_partition: partition@14800 {
+  slot1_partition: partition@14000 {
    compatible = "zephyr,mapped-partition";
    label = "image-1";
-   reg = <0x00010000 0x0018000>;
+   reg = <0x00014000 0x001C000>;
   };
 
-
+  storage_partition: partition@1C000 {
-  storage_partition: partition@1f000 {
    compatible = "zephyr,mapped-partition";
    label = "storage";
-   reg = <0x00018000 0x00020000>;
+   reg = <0x0001C000 0x00020000>;
   };
  };
 };

zephyrproject/private.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
++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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+TqGGgDa+FY/01v/MjPN50YU3hQKBgQC3Vr4MmoKQ6pj4AMXETcEJ+LZW6Vz5a5tm
-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
+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
-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
+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
-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
+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
-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
+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
-XuIS8J/FuOsXFIxZO4GRnNM6+5jnJt99qcE42k3kVQRjtoZPStWKPpLbXwKBgAJY
+wQTIfTNiOM/o3uWjBJrFRANdU+Me/FVtlX9gOguv/LjBpCFOW1cK8yFWoQKBgGjG
-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
+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
-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
+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
-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
+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
-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
+ka9m/4gGQI003R3GdFQrmeeksUoWMMoJDLSEDQCygZARCxo1U0ANtltC2yUlrl9o
-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
+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
-rywQ9K9WgOEZpeUziuuTqw91
+cCwfjXJ+/1RLKsFJV+4s+8JY
 -----END PRIVATE KEY-----

zephyrproject/public.pem

@@ -1,9 +1,9 @@
 -----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3Es05+LJagX/lOpWVel
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoOa7fNXNzvDHXzxLe6Bl
-bFtY+lvnXzln9OG2Z0r4g/52lVqEqFcH2TNSgflGTLEACqqsVYazK8IItq2SzkyG
+ABTEACGTK+zdpZHfbWXO17udZwofLqnnnV3pX11PDmqgWvrw/FECpEjN1BeWv6He
-7pqo5jtNKAR+Y6qiPCa0V9u0IPLuV24GJ8274B5slRI+vP5eior/BKZ64YYf+iak
+C+gLzl8NnJTtPByJzDmUufxnKM55Im3qoP8QzmpxQeT20TCU8HtZNwGuXseZwoRK
-Xg3SXX1Ji9TDuS5lPGLvSHgUatMg8dyXzZ/EGjSMYev8a+dEFszXqiYAf6FcGd//
+m7r4zF4U+JWARHQRcg0hawAOe1fk9XvczO0L/lm6F3pbTPyU2pHS/0jycbbp0HDh
-TOCNRxoHgPIU60wrRA7aSudG0r8CpOl/JlkP2S1TV22psovlCulKp6+6yeyK2DMr
+bwDLkCnaj5vQ9ySmLIU8bh4zcmFQ/ltiJw7AIRUmxrU5fYTV4xUXJ/cttcBCobOJ
-O3YgBqfsSCMtAnYncJRRbv7ooM4xKkl/3IgvbAVTij6E9L5uDjFQ02LzmD4Zo9Qv
+3p9JovFoyLvvjj4VBf2WUI+kWPGHOJYQCQZPJYNvOqmNvNId5TF9FvrSsg8I/vGt
-QQIDAQAB
+kwIDAQAB
 -----END PUBLIC KEY-----