Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meta upmerge #403

Merged
merged 229 commits into from
Mar 27, 2025
Merged
Changes from 1 commit
Commits
Show all changes
229 commits
Select commit Hold shift + click to select a range
bc4478c
IAR compiler compatibility break in image.h
Karambite Nov 19, 2024
95773ed
boot: zephyr: boards: add support for M5stack CoreS3/CoreS3SE
soburi Dec 21, 2024
1c04eac
imgtool: Add pure signature support
de-nordic Sep 12, 2024
1c32c9b
boot: espressif: add support for upgrade modes w/o scratch
martinjaeger Jan 5, 2025
d3080f1
Update Mbed CMakeLists.txt for Mbed CE
multiplemonomials Dec 4, 2024
4bda587
boot: bootutil: Add TLV for size of compressed but decrypted image
nordicjm Jan 9, 2025
517fc97
espressif: fix missing macro for esp32s3 XMC flash support
almir-okato Dec 19, 2024
9286264
espressif: update readme-espressif.md documentation
almir-okato Dec 19, 2024
59e9f03
espressif: add checking for supported IDF version
almir-okato Dec 19, 2024
256a02c
added missing MCUBOOT_VERSION_TWEAK in Zephyr port
m5k8 Jan 11, 2025
1da18e9
scripts: imgtool: fix compression with encryption
michalek-no Jan 2, 2025
b18b91c
boot: boot_serial: Fix uninitialised variables for upload
nordicjm Jan 15, 2025
0cd1d0a
docs: release-notes: Add note on serial recovery fix
nordicjm Jan 15, 2025
cd22b69
espressif: extend loader data
sylvioalves Jan 13, 2025
0674798
zephyr: Remove scratch from flash_area_id_from_multi_image_slot
de-nordic Jan 3, 2025
c6f5db2
bootutil: Add missing MBEDTLS_ASN1_PARSE_C
de-nordic Jan 22, 2025
3f67213
zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN and ASN1
de-nordic Jan 22, 2025
4b8a37b
zephyr: Add imgtool/cbor to pip packages installed by west
nordicjm Dec 20, 2024
f72158f
bootutil: Allow SHA512 with TinyCrypt
de-nordic Oct 2, 2024
b43b8c8
bootutil: Enable hash calculation directly on storage
de-nordic Sep 5, 2024
de9bc3d
bootutil: PureEdDSA using ED25519
de-nordic Sep 6, 2024
30e6adf
zephyr: Allow SHA512 with TinyCrypt
de-nordic Oct 2, 2024
96f01aa
zephyr: Add Kconfig and configuration for SHA on storage
de-nordic Sep 5, 2024
9668469
zephyr: Add Kconfig option to select PureEdDS
de-nordic Sep 6, 2024
2fe9cd4
boot: bootutil: Refactor some functions to have state
nordicjm Jan 14, 2025
4af7316
boot: bootutil: Add swap using offset algorithm
nordicjm Jan 2, 2025
18fee81
zephyr: Add support for swap using offset mode
nordicjm Jan 2, 2025
be9b2ad
sim: mcuboot-sys: Add support for limited sector size information
nordicjm Jan 6, 2025
09aeaeb
sim: Add swap using offset to tests
nordicjm Jan 3, 2025
afa3620
sim: Fix wrong usage of pointer
nordicjm Jan 9, 2025
4bcb969
docs: design: Add information on swap using offset mode
nordicjm Jan 3, 2025
3fea62b
docs: release-notes: Add note on new swap using offset mode
nordicjm Jan 3, 2025
fecf7e8
boot: bootutil: loader: Fix some comments
nordicjm Jan 10, 2025
e5b8952
boot: boot_serial: Add support for swap using offset mode
nordicjm Jan 15, 2025
96b7008
zephyr: Fix image encryption configuration for mbedTLS.
de-nordic Jan 24, 2025
9a02794
boot: bootutil: swap_offset: Skip erasing/copying empty sectors
nordicjm Jan 31, 2025
724ee7e
samples: compression_test
michalek-no Dec 9, 2024
25e2761
doc: compression format
michalek-no Dec 9, 2024
33094fc
boot: bootutil: loader: Fix issue with stuck revert
nordicjm Feb 10, 2025
251c054
docs: release-notes: Add note on fix for revert issue
nordicjm Feb 10, 2025
9e72eb3
doc: imgtool: importance of clear flag
michalek-no Feb 11, 2025
dbbcb78
boot/zephyr: Fix SINGLE_APPLICATION_SLOT_RAM_LOAD file inclusion
edersondisouza Feb 4, 2025
98a6681
boot/bootutil: Get bootloader state
edersondisouza Dec 20, 2024
c9aa7fd
boot/bootutil: Make RAM loading methods public
edersondisouza Dec 20, 2024
b3ed5cc
boot: New boot_go hook
edersondisouza Dec 23, 2024
2aa6da1
boot: Add flash area ID/device ID retrieval hooks
edersondisouza Dec 20, 2024
1017c43
samples: Add a sample for runtime chosen image
edersondisouza Aug 7, 2024
7c620b9
samples/runtime-source: Make it buildable on twister
edersondisouza Jan 6, 2025
346f737
boot: bootutil: Use BOOT_IMG_AREA to get boot_loader_state area
de-nordic Feb 12, 2025
92422ca
mynewt: Add flash_sector_get_size
de-nordic Dec 12, 2024
e025689
bootutil: Add support for devices without erase and reduced erases
de-nordic Nov 11, 2024
c12dced
zephyr: Add support for devices without erase and reduced erases
de-nordic Nov 12, 2024
ecd4877
zephyr: Use flash_area_flatten in bs_custom_storage_erase
de-nordic Nov 12, 2024
e5c0078
boot: Enable MCUBOOT_DEV_WITH_ERASE in other systems
de-nordic Dec 10, 2024
615a9df
bootutil: PSA implementation of x25519 and ed25519 verification
de-nordic May 29, 2024
f2b6def
zephyr: Enable building ed25519 PSA variant with Zephyr
de-nordic Jan 24, 2025
1dcfbda
bootutil: Allow bypassing ASN.1 encoding for ED25519 key import
de-nordic Oct 8, 2024
3ff7549
zephyr: Add Kconfig option CONFIG_BOOT_KEY_IMPORT_BYPASS_ASN
de-nordic Oct 8, 2024
602cb45
Fix path for DT example
bontric Feb 17, 2025
c513187
Revert "boot: Enable MCUBOOT_DEV_WITH_ERASE in other systems"
de-nordic Feb 18, 2025
9c84013
Revert "zephyr: Use flash_area_flatten in bs_custom_storage_erase"
de-nordic Feb 18, 2025
dbbeae4
Revert "zephyr: Add support for devices without erase and reduced era…
de-nordic Feb 18, 2025
ef78369
Revert "bootutil: Add support for devices without erase and reduced e…
de-nordic Feb 18, 2025
429e2fe
boot: zephyr: kconfig: Add new defaults option for FIH
nordicjm Feb 17, 2025
7330df7
boot: bootutil: Fix last sector index computation for swap-offset
taltenbach Feb 22, 2025
7724bcf
sim: Add device with larger sectors in slot 0 than in slot 1
taltenbach Feb 15, 2025
fbd2267
boot: bootutil: Fix invalid last sector computation for swap-scratch
taltenbach Feb 15, 2025
a43167e
zephyr: fix Mbed TLS configuration header file selection
valeriosetti Feb 17, 2025
7fd7611
sim: Avoid assuming trailer is sector-aligned for swap-scratch + max-…
taltenbach Feb 15, 2025
8975d5c
boot: bootutil: Fix underflow in swap-scratch when trailer is large
taltenbach Feb 16, 2025
66d41e7
boot: bootutil: Fix scratch trailer overwritten if image trailer is l…
taltenbach Feb 16, 2025
d1a3b95
boot: bootutil: Ensure the whole trailer is erased when it is large
taltenbach Feb 16, 2025
d00b11d
boot: bootutil: Take into account scratch trailer when computing max …
taltenbach Feb 17, 2025
1b2fc09
boot: Reuse pointers for flash_area objects from state
de-nordic Feb 17, 2025
141eea5
Revert "[nrf noup] zephyr: Use mbedTLS specific C functions with RSA"
nordicjm Mar 26, 2025
71fdba2
Revert "[nrf fromtree] boot: bootutil: Add TLV for size of compressed…
nordicjm Mar 26, 2025
e94fddd
Revert "[nrf noup] boot: bootutil: Allow configuring number of KMU keys"
nordicjm Mar 26, 2025
9d96f13
Revert "[nrf noup] boot: zephyr: Add experimental selection to compre…
nordicjm Mar 26, 2025
88b600b
Revert "[nrf noup] bootutil: Add support for KMU stored ED25519 signa…
nordicjm Mar 26, 2025
8587cbf
Revert "[nrf noup] Remove setting default MCUboot mbedTLS config"
nordicjm Mar 26, 2025
9e76197
Revert "[nrf noup] zephyr: Add support for ARM thumb filter"
nordicjm Mar 26, 2025
38dfc5d
Revert "[nrf noup] zephyr: Add support for compressed image updates"
nordicjm Mar 26, 2025
9b05015
Revert "[nrf noup] zephyr: Fix path variables"
nordicjm Mar 26, 2025
fbbf9a8
Revert "[nrf noup] zephyr: sdk-nrf specific overrides on PSA Kconfigs"
nordicjm Mar 26, 2025
e335b7e
Revert "[nrf fromlist] bootutil: Fix ed25519 pure signature verificat…
nordicjm Mar 26, 2025
3ebc4cc
Revert "[nrf fromtree] zephyr: Add missing selection for allowed SHA …
nordicjm Mar 26, 2025
47961c3
Revert "[nrf fromtree] zephyr: Fix ED25519 compilation with mbedTLS"
nordicjm Mar 26, 2025
14219ab
Revert "[nrf fromtree] zephyr: Prevent selecting MBEDTLS_ASN1_PARSE_C…
nordicjm Mar 26, 2025
13022a5
Revert "[nrf fromtree] zephyr: Do not compile ASN1 code when bypassed"
nordicjm Mar 26, 2025
b885e39
Revert "[nrf fromtree] bootutil: Fix ASN1 bypass not building"
nordicjm Mar 26, 2025
e929260
Revert "[nrf fromtree] zephyr: Add Kconfig option CONFIG_BOOT_KEY_IMP…
nordicjm Mar 26, 2025
ffbd27a
Revert "[nrf fromtree] bootutil: Allow bypassing ASN.1 encoding for E…
nordicjm Mar 26, 2025
0f96030
Revert "[nrf fromtree] zephyr: Enable building ed25519 PSA variant wi…
nordicjm Mar 26, 2025
e776729
Revert "[nrf fromtree] bootutil: PSA implementation of x25519 and ed2…
nordicjm Mar 26, 2025
ba302f0
Revert "[nrf fromtree] zephyr: Fix image encryption configuration for…
nordicjm Mar 26, 2025
e5e61ac
Revert "[nrf fromtree] zephyr: Add Kconfig option to select PureEdDS"
nordicjm Mar 26, 2025
f612f18
Revert "[nrf fromtree] zephyr: Add Kconfig and configuration for SHA …
nordicjm Mar 26, 2025
9bfc0fa
Revert "[nrf fromtree] zephyr: Allow SHA512 with TinyCrypt"
nordicjm Mar 26, 2025
5c25449
Revert "[nrf fromtree] bootutil: PureEdDSA using ED25519"
nordicjm Mar 26, 2025
bb08883
Revert "[nrf fromtree] bootutil: Enable hash calculation directly on …
nordicjm Mar 26, 2025
61ff2bd
Revert "[nrf fromtree] bootutil: Allow SHA512 with TinyCrypt"
nordicjm Mar 26, 2025
b589296
Revert "[nrf fromtree] zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN an…
nordicjm Mar 26, 2025
a264391
Revert "[nrf noup] partition_manager: Add support for internal flash …
nordicjm Mar 26, 2025
32cf74e
Revert "[nrf fromlist] boot: zephyr: kconfig: Add new defaults option…
nordicjm Mar 26, 2025
03d14c3
Revert "[nrf fromtree] doc: imgtool: importance of clear flag"
nordicjm Mar 26, 2025
cc871a0
Revert "[nrf fromtree] boot: bootutil: loader: Fix some comments"
nordicjm Mar 26, 2025
232ae06
Revert "[nrf fromtree] bootutil: Add missing MBEDTLS_ASN1_PARSE_C"
nordicjm Mar 26, 2025
5b6baeb
Revert "[nrf fromtree] zephyr: Remove scratch from flash_area_id_from…
nordicjm Mar 26, 2025
b10150c
Revert "[nrf fromtree] boot: boot_serial: Fix uninitialised variables…
nordicjm Mar 26, 2025
315be13
Revert "[nrf fromtree] scripts: imgtool: fix compression with encrypt…
nordicjm Mar 26, 2025
ea99b25
Revert "[nrf fromtree] added missing MCUBOOT_VERSION_TWEAK in Zephyr …
nordicjm Mar 26, 2025
ab1f2c2
Revert "[nrf noup] boot: zephyr: boards: Disabled NCS boot banner for…
nordicjm Mar 26, 2025
aa4d157
Revert "[nrf noup] sysflash: Add missing _FLASH_0_ID definitions"
nordicjm Mar 26, 2025
f9577a4
Revert "[nrf noup] boot: Remove child/parent references"
nordicjm Mar 26, 2025
9514ec8
Revert "[nrf noup] boot/zephyr/boards: configure fastest RRAM operati…
nordicjm Mar 26, 2025
04ce425
Revert "[nrf noup] boot: zephyr: serial_recovery: Add nRF5340 Kconfig…
nordicjm Mar 26, 2025
bb25ee1
Revert "[nrf noup] boot/zephyr/Kconfig: conditionally disable BOOT_MA…
nordicjm Mar 26, 2025
8ef909a
Revert "[nrf noup] boot/zephyr: add nrf54l15dk ext flash configs"
nordicjm Mar 26, 2025
821c869
Revert "[nrf noup] workflows: Add a backport workflow"
nordicjm Mar 26, 2025
b37c139
Revert "[nrf noup] boards: Thingy:91 X release config"
nordicjm Mar 26, 2025
1fd9e30
Revert "[nrf noup] boot: bootutil: loader: Add s0/s1 checking of MCUb…
nordicjm Mar 26, 2025
fd4a2f4
Revert "[nrf noup] treewide: Add support for sysbuild assigned images"
nordicjm Mar 26, 2025
5b96060
Revert "[nrf noup] boot: zephyr: Do not lock PCD region with TF-M"
nordicjm Mar 26, 2025
16049fd
Revert "[nrf noup] boot: Add shared crypto for ECDSA and SHA"
nordicjm Mar 26, 2025
6b72524
Revert "[nrf noup] boards: nrf54l15dk: Disable FPROTECT"
nordicjm Mar 26, 2025
48cbb9a
Revert "[nrf noup] bootutil: loader: Fix netcore address checking"
nordicjm Mar 26, 2025
66f75a2
Revert "[nrf noup] boot/../loader: reboot after updating s0/s1"
nordicjm Mar 26, 2025
e2f1dad
Revert "[nrf noup] boot/../loader: skip downgrade prevention for s1/s0"
nordicjm Mar 26, 2025
e55b999
Revert "[nrf noup] boot: zephyr: Add NCS boot banner"
nordicjm Mar 26, 2025
853f1d4
Revert "[nrf noup] zephyr/boards: fix nrf54l15pdk ext flash dts overlay"
nordicjm Mar 26, 2025
85d13bf
Revert "[nrf noup] Revert of zephyr: arm: Update reading the flash im…
nordicjm Mar 26, 2025
c810552
Revert "[nrf noup] boot/zephyr: fix fw_info search"
nordicjm Mar 26, 2025
f0c3867
Revert "[nrf noup] boot: zephyr: Disable boot banner if NCS_BOOT_BANN…
nordicjm Mar 26, 2025
70c7ca6
Revert "[nrf noup] boards: thingy91x: enable serial recovery"
nordicjm Mar 26, 2025
bafd0a0
Revert "[nrf noup] boot/zephyr/boards: nrf54l15pdk ext-flash update"
nordicjm Mar 26, 2025
f196714
Revert "[nrf noup] boot/zephyr/boards: nrf54l15pdk ext-flash partition"
nordicjm Mar 26, 2025
f854fa0
Revert "[nrf noup] loader: remove cleanup for direct xip mode"
nordicjm Mar 26, 2025
0cdd6c4
Revert "[nrf noup] boards: nrf54l15: Disable FPROTECT"
nordicjm Mar 26, 2025
76c85fa
Revert "[nrf noup] loader: introduced cleanup of unusable secondary s…
nordicjm Mar 26, 2025
9b5c2a4
Revert "[nrf noup] sysflash: Add support for three images"
nordicjm Mar 26, 2025
a1e81f1
Revert "[nrf noup] sysflash: Move partition manager definitions to pm…
nordicjm Mar 26, 2025
7b82725
Revert "[nrf noup] boot: Add support for NSIB and multi-image"
nordicjm Mar 26, 2025
681c002
Revert "[nrf noup] loader: Fix missing PCD define check"
nordicjm Mar 26, 2025
12f02a4
Revert "[nrf noup] loader: work-around for multi-image builds"
nordicjm Mar 26, 2025
efd812b
Revert "[nrf noup] boot/zephyr/boards: nRF54l15pdk ext flash cfg"
nordicjm Mar 26, 2025
dabd36e
Revert "[nrf noup] boards: thingy53: disable GPIO ISR support"
nordicjm Mar 26, 2025
1c23f38
Revert "[nrf noup] loader: Add firmware version check downgrade preve…
nordicjm Mar 26, 2025
d511de7
Revert "[nrf noup] zephyr: Boot even if EXT_ABI is not provided"
nordicjm Mar 26, 2025
714bed2
Revert "[nrf noup] zephyr: Add RAM flash configuration to cache for s…
nordicjm Mar 26, 2025
5c1fe37
Revert "[nrf noup] loader: Do not check reset vector for XIP image"
nordicjm Mar 26, 2025
256d159
Revert "[nrf noup] loader: Fix reading reset addr to support ext flash"
nordicjm Mar 26, 2025
7dfd88e
Revert "[nrf noup] zephyr: Clean up non-secure RAM if enabled"
nordicjm Mar 26, 2025
4463b2d
Revert "[nrf noup] zephyr: clean peripherals state before boot"
nordicjm Mar 26, 2025
7ed8d26
Revert "[nrf noup] boot: nrf53-specific customizations"
nordicjm Mar 26, 2025
64c611d
Revert "[nrf noup] treewide: add NCS partition manager support"
nordicjm Mar 26, 2025
e8a0325
Revert "[nrf noup] boards: thingy91x: add board config"
nordicjm Mar 26, 2025
0fbbaa7
Revert "[nrf noup] zephyr: Restore default RTC user channel count"
nordicjm Mar 26, 2025
c9a6970
Revert "[nrf noup] boards: add support for Thingy:91"
nordicjm Mar 26, 2025
3b11afc
Revert "[nrf noup] zephyr: add 'minimal' configuration files"
nordicjm Mar 26, 2025
91dfd7d
Revert "[nrf noup] zephyr: Remove duplication from cmake"
nordicjm Mar 26, 2025
820a62d
Revert "[nrf noup] github: Add a commit tags check workflow"
nordicjm Mar 26, 2025
3d9b08e
Revert "[nrf fromtree] imgtool: Add pure signature support"
nordicjm Mar 26, 2025
b872afb
[nrf mergeup] Merge upstream up to commit 1b2fc096d9a683a7481b13749d0…
nordicjm Mar 26, 2025
0912fcd
[nrf noup] github: Add a commit tags check workflow
carlescufi Oct 10, 2023
18db93f
[nrf noup] zephyr: Remove duplication from cmake
sigvartmh Mar 26, 2019
cf7f4f6
[nrf noup] zephyr: add 'minimal' configuration files
mbolivar-nordic Sep 3, 2021
0707621
[nrf noup] boards: add support for Thingy:91
bjda Sep 20, 2019
072f69f
[nrf noup] zephyr: Restore default RTC user channel count
Damian-Nordic Mar 21, 2022
27d3de4
[nrf noup] boards: thingy91x: add board config
maxd-nordic Dec 8, 2023
70d45f0
[nrf noup] treewide: add NCS partition manager support
SebastianBoe Dec 12, 2018
ff0cc9c
[nrf noup] boot: nrf53-specific customizations
sigvartmh Aug 27, 2020
f943266
[nrf noup] zephyr: clean peripherals state before boot
nvlsianpu Feb 27, 2020
ed0ee1f
[nrf noup] zephyr: Clean up non-secure RAM if enabled
sigvartmh Jan 6, 2023
afd1f6f
[nrf noup] loader: Fix reading reset addr to support ext flash
chrta Feb 10, 2022
78f267f
[nrf noup] loader: Do not check reset vector for XIP image
de-nordic Sep 22, 2023
5694ff5
[nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild
nordicjm Sep 18, 2023
79ca478
[nrf noup] zephyr: Boot even if EXT_ABI is not provided
sigvartmh Oct 17, 2023
bb083ba
[nrf noup] loader: Add firmware version check downgrade prevention
sigvartmh Sep 27, 2023
fa08422
[nrf noup] boards: thingy53: disable GPIO ISR support
nika-nordic Oct 9, 2023
8c73d8b
[nrf noup] boot/zephyr/boards: nRF54l15pdk ext flash cfg
nvlsianpu Apr 11, 2024
8c62ac9
[nrf noup] loader: work-around for multi-image builds
sigvartmh Mar 30, 2021
566af5e
[nrf noup] loader: Fix missing PCD define check
nordicjm Aug 31, 2023
1f08c79
[nrf noup] boot: Add support for NSIB and multi-image
sigvartmh May 31, 2023
0117f67
[nrf noup] sysflash: Move partition manager definitions to pm_sysflash.h
de-nordic Aug 10, 2023
6f0279b
[nrf noup] sysflash: Add support for three images
de-nordic Aug 11, 2023
154f4df
[nrf noup] loader: introduced cleanup of unusable secondary slot
nvlsianpu Feb 15, 2024
ef7aad1
[nrf noup] boards: nrf54l15: Disable FPROTECT
gchwier Apr 16, 2024
ab602b1
[nrf noup] loader: remove cleanup for direct xip mode
gchwier May 17, 2024
cf16b82
[nrf noup] boot/zephyr/boards: nrf54l15pdk ext-flash partition
nvlsianpu Apr 15, 2024
a493f54
[nrf noup] boot/zephyr/boards: nrf54l15pdk ext-flash update
nvlsianpu May 20, 2024
bf1b0fa
[nrf noup] boards: thingy91x: enable serial recovery
maxd-nordic Mar 12, 2024
2f25a92
[nrf noup] boot: zephyr: Disable boot banner if NCS_BOOT_BANNER is used
rlubos May 17, 2024
09e1b9c
[nrf noup] boot/zephyr: fix fw_info search
nvlsianpu May 27, 2024
52c087a
[nrf noup] Revert of zephyr: arm: Update reading the flash image rese…
de-nordic May 28, 2024
466fe91
[nrf noup] zephyr/boards: fix nrf54l15pdk ext flash dts overlay
nvlsianpu Jun 5, 2024
fe5f292
[nrf noup] boot: zephyr: Add NCS boot banner
nordicjm Jun 11, 2024
8e6e3c2
[nrf noup] boot/../loader: skip downgrade prevention for s1/s0
nvlsianpu Jun 13, 2024
b6eb818
[nrf noup] boot/../loader: reboot after updating s0/s1
nvlsianpu Jun 18, 2024
a186416
[nrf noup] bootutil: loader: Fix netcore address checking
nordicjm Aug 29, 2024
243017c
[nrf noup] boards: nrf54l15dk: Disable FPROTECT
nvlsianpu Sep 18, 2024
259eadb
[nrf noup] boot: Add shared crypto for ECDSA and SHA
sigvartmh Feb 14, 2019
01f3b09
[nrf noup] boot: zephyr: Do not lock PCD region with TF-M
MarkusLassila Aug 30, 2024
3308732
[nrf noup] treewide: Add support for sysbuild assigned images
nordicjm Sep 10, 2024
4738ae8
[nrf noup] boot: bootutil: loader: Add s0/s1 checking of MCUboot image
nordicjm Oct 15, 2024
52322e2
[nrf noup] boards: Thingy:91 X release config
maxd-nordic Oct 23, 2024
22409c3
[nrf noup] workflows: Add a backport workflow
carlescufi Oct 25, 2024
8e5297e
[nrf noup] boot/zephyr: add nrf54l15dk ext flash configs
michalek-no Nov 7, 2024
b66e930
[nrf noup] boot/zephyr/Kconfig: conditionally disable BOOT_MAX_IMG_SE…
nvlsianpu Sep 19, 2024
b169015
[nrf noup] boot: zephyr: serial_recovery: Add nRF5340 Kconfig override
nordicjm Dec 9, 2024
d18f8fd
[nrf noup] boot/zephyr/boards: configure fastest RRAM operations
nvlsianpu Dec 17, 2024
b7a30ff
[nrf noup] boot: Remove child/parent references
nordicjm Dec 5, 2024
b9578ab
[nrf noup] sysflash: Add missing _FLASH_0_ID definitions
de-nordic Jan 15, 2025
1027dd8
[nrf noup] boot: zephyr: boards: Disabled NCS boot banner for thingy 53
kkasperczyk-no Jan 24, 2025
f3fedff
[nrf noup] partition_manager: Add support for internal flash netcore DFU
hellesvik-nordic Feb 6, 2025
5d9a95c
[nrf fromtree] bootutil: Fix ASN1 bypass not building
de-nordic Mar 12, 2025
ff7f0de
[nrf fromtree] zephyr: Do not compile ASN1 code when bypassed
de-nordic Mar 12, 2025
c617eba
[nrf fromtree] zephyr: Prevent selecting MBEDTLS_ASN1_PARSE_C when no…
de-nordic Mar 12, 2025
f6ca88a
[nrf fromtree] zephyr: Fix ED25519 compilation with mbedTLS
de-nordic Mar 12, 2025
69a9336
[nrf fromtree] zephyr: Add missing selection for allowed SHA algorithms
de-nordic Mar 13, 2025
e9d9678
[nrf fromtree] bootutil: Fix ed25519 pure signature verification
de-nordic Mar 18, 2025
fa89f7b
[nrf noup] zephyr: sdk-nrf specific overrides on PSA Kconfigs
de-nordic Mar 4, 2025
5c886db
[nrf noup] zephyr: Fix path variables
nordicjm Jul 11, 2023
b2fc324
[nrf noup] zephyr: Add support for compressed image updates
nordicjm Aug 22, 2024
2ae98d5
[nrf noup] bootutil: Add support for KMU stored ED25519 signature key
de-nordic Sep 20, 2024
1c9556a
[nrf noup] boot: zephyr: Add experimental selection to compression
nordicjm Nov 7, 2024
59987a6
[nrf noup] boot: bootutil: Allow configuring number of KMU keys
nordicjm Dec 2, 2024
03d9b4f
[nrf noup] zephyr: Use mbedTLS specific C functions with RSA
de-nordic Mar 14, 2025
dd65770
[nrf fromtree] boot: zephyr: Only supply MBEDTLS config file path if set
nordicjm Mar 26, 2025
14cbca4
[nrf fromlist] docs: compression_format: Fix tags
nordicjm Mar 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sim: mcuboot-sys: Add support for limited sector size information
Adds support for getting the sector size of less sectors than are
in an image, which mirrors support in zephyr and allows getting
just the size of the first sector in an image

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
nordicjm committed Jan 27, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit be9b2ad312ab3ecbf4628b63671cfb7cdbdd000f
27 changes: 15 additions & 12 deletions sim/mcuboot-sys/csupport/run.c
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
#include <string.h>
#include <bootutil/bootutil.h>
#include <bootutil/image.h>
#include <errno.h>

#include <flash_map_backend/flash_map_backend.h>

@@ -369,6 +370,7 @@ int flash_area_erase(const struct flash_area *area, uint32_t off, uint32_t len)

int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret)
{
int rc = 0;
uint32_t i;
struct area *slot;
struct area_desc *flash_areas;
@@ -385,20 +387,21 @@ int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret)

slot = &flash_areas->slots[i];

if (slot->num_areas > (uint32_t)*cnt) {
printf("Too many areas in slot\n");
abort();
if ((uint32_t)*cnt > slot->num_areas) {
*cnt = slot->num_areas;
} else if (slot->num_areas > (uint32_t)*cnt) {
rc = -ENOMEM;
}

*cnt = slot->num_areas;
memcpy(ret, slot->areas, slot->num_areas * sizeof(struct flash_area));
memcpy(ret, slot->areas, *cnt * sizeof(struct flash_area));

return 0;
return rc;
}

int flash_area_get_sectors(int fa_id, uint32_t *count,
struct flash_sector *sectors)
{
int rc = 0;
uint32_t i;
struct area *slot;
struct area_desc *flash_areas;
@@ -415,19 +418,19 @@ int flash_area_get_sectors(int fa_id, uint32_t *count,

slot = &flash_areas->slots[i];

if (slot->num_areas > *count) {
printf("Too many areas in slot\n");
abort();
if (*count > slot->num_areas) {
*count = slot->num_areas;
} else if (slot->num_areas > *count) {
rc = -ENOMEM;
}

for (i = 0; i < slot->num_areas; i++) {
for (i = 0; i < *count; i++) {
sectors[i].fs_off = slot->areas[i].fa_off -
slot->whole.fa_off;
sectors[i].fs_size = slot->areas[i].fa_size;
}
*count = slot->num_areas;

return 0;
return rc;
}

int flash_area_id_to_multi_image_slot(int image_index, int area_id)