Skip to content

Commit cdf9f61

Browse files
kkasperczyk-nocarlescufi
authored andcommitted
samples: matter: Fixed DFU for nRF54L10
The partitions for nRF54L10 were aligned to 0x800 what is not allowed and because of that the DFU was failing. Additionally, the size used by pm for partitions had to be reduced from 1022 to 1020 kB. Signed-off-by: Kamil Kasperczyk <[email protected]> (cherry picked from commit fa55dd6)
1 parent 487dba1 commit cdf9f61

File tree

6 files changed

+63
-42
lines changed

6 files changed

+63
-42
lines changed

samples/matter/manufacturer_specific/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,56 @@ mcuboot:
55
mcuboot_pad:
66
address: 0xD000
77
region: flash_primary
8-
size: 0x800
8+
size: 0x1000
99
app:
10-
address: 0xD800
10+
address: 0xE000
1111
region: flash_primary
12-
size: 0xE7000
12+
size: 0xE6000
1313
mcuboot_primary:
1414
orig_span: &id001
1515
- mcuboot_pad
1616
- app
1717
span: *id001
1818
address: 0xD000
1919
region: flash_primary
20-
size: 0xE7800
20+
size: 0xE7000
2121
mcuboot_primary_app:
2222
orig_span: &id002
2323
- app
2424
span: *id002
25-
address: 0xD800
25+
address: 0xE000
2626
region: flash_primary
27-
size: 0xE7000
27+
size: 0xE6000
2828
factory_data:
29-
address: 0xF4800
29+
address: 0xF4000
3030
region: flash_primary
3131
size: 0x1000
3232
settings_storage:
33-
address: 0xF5800
33+
address: 0xF5000
3434
region: flash_primary
3535
size: 0xA000
36+
reserved:
37+
address: 0xFF000
38+
region: flash_primary
39+
size: 0x800
3640
mcuboot_secondary:
3741
address: 0x0
3842
orig_span: &id003
3943
- mcuboot_secondary_pad
4044
- mcuboot_secondary_app
4145
region: external_flash
42-
size: 0xE7800
46+
size: 0xE7000
4347
span: *id003
4448
mcuboot_secondary_pad:
4549
region: external_flash
4650
address: 0x0
47-
size: 0x800
51+
size: 0x1000
4852
mcuboot_secondary_app:
4953
region: external_flash
50-
address: 0x800
51-
size: 0xE7000
54+
address: 0x1000
55+
size: 0xE6000
5256
external_flash:
53-
address: 0xE7800
54-
size: 0x718800
57+
address: 0xE7000
58+
size: 0x719000
5559
device: MX25R64
5660
region: external_flash

samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
2727
# reset + 1. Hence, the reboot time increases more and more.
2828
# To avoid it enable tickles kernel for mcuboot.
2929
CONFIG_TICKLESS_KERNEL=y
30+
31+
# Mcuboot padding size is modified to 0x1000 in pm_static file.
32+
CONFIG_PM_PARTITION_SIZE_MCUBOOT_PAD=0x1000

samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,56 @@ mcuboot:
55
mcuboot_pad:
66
address: 0xD000
77
region: flash_primary
8-
size: 0x800
8+
size: 0x1000
99
app:
10-
address: 0xD800
10+
address: 0xE000
1111
region: flash_primary
12-
size: 0xE7000
12+
size: 0xE6000
1313
mcuboot_primary:
1414
orig_span: &id001
1515
- mcuboot_pad
1616
- app
1717
span: *id001
1818
address: 0xD000
1919
region: flash_primary
20-
size: 0xE7800
20+
size: 0xE7000
2121
mcuboot_primary_app:
2222
orig_span: &id002
2323
- app
2424
span: *id002
25-
address: 0xD800
25+
address: 0xE000
2626
region: flash_primary
27-
size: 0xE7000
27+
size: 0xE6000
2828
factory_data:
29-
address: 0xF4800
29+
address: 0xF4000
3030
region: flash_primary
3131
size: 0x1000
3232
settings_storage:
33-
address: 0xF5800
33+
address: 0xF5000
3434
region: flash_primary
3535
size: 0xA000
36+
reserved:
37+
address: 0xFF000
38+
region: flash_primary
39+
size: 0x800
3640
mcuboot_secondary:
3741
address: 0x0
3842
orig_span: &id003
3943
- mcuboot_secondary_pad
4044
- mcuboot_secondary_app
4145
region: external_flash
42-
size: 0xE7800
46+
size: 0xE7000
4347
span: *id003
4448
mcuboot_secondary_pad:
4549
region: external_flash
4650
address: 0x0
47-
size: 0x800
51+
size: 0x1000
4852
mcuboot_secondary_app:
4953
region: external_flash
50-
address: 0x800
51-
size: 0xE7000
54+
address: 0x1000
55+
size: 0xE6000
5256
external_flash:
53-
address: 0xE7800
54-
size: 0x718800
57+
address: 0xE7000
58+
size: 0x719000
5559
device: MX25R64
5660
region: external_flash

samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ CONFIG_TICKLESS_KERNEL=y
3030

3131
# Low Power mode
3232
CONFIG_POWEROFF=y
33+
34+
# Mcuboot padding size is modified to 0x1000 in pm_static file.
35+
CONFIG_PM_PARTITION_SIZE_MCUBOOT_PAD=0x1000

samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,56 @@ mcuboot:
55
mcuboot_pad:
66
address: 0xD000
77
region: flash_primary
8-
size: 0x800
8+
size: 0x1000
99
app:
10-
address: 0xD800
10+
address: 0xE000
1111
region: flash_primary
12-
size: 0xE7000
12+
size: 0xE6000
1313
mcuboot_primary:
1414
orig_span: &id001
1515
- mcuboot_pad
1616
- app
1717
span: *id001
1818
address: 0xD000
1919
region: flash_primary
20-
size: 0xE7800
20+
size: 0xE7000
2121
mcuboot_primary_app:
2222
orig_span: &id002
2323
- app
2424
span: *id002
25-
address: 0xD800
25+
address: 0xE000
2626
region: flash_primary
27-
size: 0xE7000
27+
size: 0xE6000
2828
factory_data:
29-
address: 0xF4800
29+
address: 0xF4000
3030
region: flash_primary
3131
size: 0x1000
3232
settings_storage:
33-
address: 0xF5800
33+
address: 0xF5000
3434
region: flash_primary
3535
size: 0xA000
36+
reserved:
37+
address: 0xFF000
38+
region: flash_primary
39+
size: 0x800
3640
mcuboot_secondary:
3741
address: 0x0
3842
orig_span: &id003
3943
- mcuboot_secondary_pad
4044
- mcuboot_secondary_app
4145
region: external_flash
42-
size: 0xE7800
46+
size: 0xE7000
4347
span: *id003
4448
mcuboot_secondary_pad:
4549
region: external_flash
4650
address: 0x0
47-
size: 0x800
51+
size: 0x1000
4852
mcuboot_secondary_app:
4953
region: external_flash
50-
address: 0x800
51-
size: 0xE7000
54+
address: 0x1000
55+
size: 0xE6000
5256
external_flash:
53-
address: 0xE7800
54-
size: 0x718800
57+
address: 0xE7000
58+
size: 0x719000
5559
device: MX25R64
5660
region: external_flash

samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
2727
# reset + 1. Hence, the reboot time increases more and more.
2828
# To avoid it enable tickles kernel for mcuboot.
2929
CONFIG_TICKLESS_KERNEL=y
30+
31+
# Mcuboot padding size is modified to 0x1000 in pm_static file.
32+
CONFIG_PM_PARTITION_SIZE_MCUBOOT_PAD=0x1000

0 commit comments

Comments
 (0)