Skip to content

Conversation

valeriosetti
Copy link
Contributor

Mbed TLS already provides MBEDTLS_CFG_FILE Kconfig when it's builtin. So we only need to override that config when not using the builtin Mbed TLS version.

This commit also fixes some hardcoding of "mcuboot-mbedtls-cfg.h" in Kconfig and prj.conf.

This should also help fixing zephyrproject-rtos/zephyr#86172

@valeriosetti valeriosetti marked this pull request as ready for review February 27, 2025 10:17
valeriosetti added a commit to valeriosetti/zephyr that referenced this pull request Feb 28, 2025
This is needed to include changes from
mcu-tools/mcuboot#2222

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
Mbed TLS already provides MBEDTLS_CFG_FILE Kconfig when it's builtin. So
we only need to override that config when not using the builtin Mbed TLS
version.

This commit also fixes some hardcoding of "mcuboot-mbedtls-cfg.h" in
Kconfig and prj.conf.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
@valeriosetti valeriosetti force-pushed the remove-unused-headers-mcuboot-upstream branch from 021a042 to 5c8ee8c Compare February 28, 2025 16:19
@valeriosetti
Copy link
Contributor Author

Just updated the PR fixing some issues that @de-nordic notified me offline (not found by the CI).

This new version was successfully tested on a nrf52840dk board with the following builds:

west build -p always --sysbuild -d build/mcuboot_hello_rsa_enc -b nrf52840dk/nrf52840 samples/hello_world/ -DSB_CONFIG_BOOTLOADER_MCUBOOT=y -DSB_CONFIG_BOOT_SIGNATURE_TYPE_RSA=y -DSB_CONFIG_BOOT_ENCRYPTION=y

west build -p always --sysbuild -d build/mcuboot_hello_ecdsa_enc -b nrf52840dk/nrf52840 samples/hello_world/ -DSB_CONFIG_BOOTLOADER_MCUBOOT=y -DSB_CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y -DSB_CONFIG_BOOT_ENCRYPTION=y

west build -p always --sysbuild -d build/mcuboot_hello_ed25519_enc -b nrf52840dk/nrf52840 samples/hello_world/ -DSB_CONFIG_BOOTLOADER_MCUBOOT=y -DSB_CONFIG_BOOT_SIGNATURE_TYPE_ED25519=y -DSB_CONFIG_BOOT_ENCRYPTION=y

@nordicjm nordicjm merged commit a43167e into mcu-tools:main Mar 7, 2025
58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants