Skip to content

Commit 835b63f

Browse files
michalek-norlubos
authored andcommitted
[nrf noup] boot/zephyr: add nrf54l15dk ext flash configs
Moved configs from nrf54l15pdk. Turn protection on fprotect by default. Signed-off-by: Andrzej Puzdrowski <[email protected]> Signed-off-by: Mateusz Michalek <[email protected]> Signed-off-by: Michal Kozikowski <[email protected]> Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit add70d4)
1 parent e406849 commit 835b63f

7 files changed

+71
-21
lines changed

boot/zephyr/boards/nrf54l15dk_nrf54l15_cpuapp.conf

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CONFIG_SPI=y
2+
CONFIG_SPI_NOR=y
3+
CONFIG_FLASH=y
4+
CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x14000
5+
CONFIG_MAIN_STACK_SIZE=20480
6+
CONFIG_BOOT_MAX_IMG_SECTORS=512
7+
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
8+
# Ensure that the qspi driver is disabled by default
9+
CONFIG_NORDIC_QSPI_NOR=n
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/ {
2+
chosen {
3+
nordic,pm-ext-flash = &mx25r64;
4+
zephyr,code-partition = &boot_partition;
5+
};
6+
};
7+
8+
/delete-node/ &boot_partition;
9+
/delete-node/ &slot0_partition;
10+
/delete-node/ &slot1_partition;
11+
12+
/delete-node/ &storage_partition;
13+
14+
&cpuapp_rram {
15+
reg = < 0x0 DT_SIZE_K(1524) >;
16+
17+
partitions {
18+
boot_partition: partition@0 {
19+
label = "mcuboot";
20+
reg = <0x000000000 0x00014000>;
21+
};
22+
23+
slot0_partition: partition@14000 {
24+
label = "image-0";
25+
reg = <0x000014000 0x0015A000>;
26+
};
27+
28+
storage_partition: partition@16E000 {
29+
label = "storage";
30+
reg = < 0x16E000 0x9000 >;
31+
};
32+
};
33+
};
34+
35+
&mx25r64 {
36+
status = "okay";
37+
38+
partitions {
39+
compatible = "fixed-partitions";
40+
#address-cells = <1>;
41+
#size-cells = <1>;
42+
43+
slot1_partition: partition@0 {
44+
label = "image-1";
45+
reg = <0x000000000 0x0015A000>;
46+
};
47+
};
48+
};

boot/zephyr/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n
1818
# CONFIG_TINYCRYPT_SHA256 is not set
1919

2020
CONFIG_FLASH=y
21-
CONFIG_FPROTECT=y
2221

2322
### Various Zephyr boards enable features that we don't want.
2423
# CONFIG_BT is not set

boot/zephyr/boards/nrf54l15dk_nrf54l05_cpuapp.conf renamed to boot/zephyr/socs/nrf54l05_cpuapp.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
77
# Ensure that the SPI NOR driver is disabled by default
88
CONFIG_SPI_NOR=n
99

10-
CONFIG_FPROTECT=y
11-
1210
CONFIG_BOOT_WATCHDOG_FEED=n
1311

1412
# Ensure the fastest RRAM write operations

boot/zephyr/boards/nrf54l15dk_nrf54l10_cpuapp.conf renamed to boot/zephyr/socs/nrf54l10_cpuapp.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
77
# Ensure that the SPI NOR driver is disabled by default
88
CONFIG_SPI_NOR=n
99

10-
CONFIG_FPROTECT=y
11-
1210
CONFIG_BOOT_WATCHDOG_FEED=n
1311

1412
# Ensure the fastest RRAM write operations

boot/zephyr/socs/nrf54l15_cpuapp.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright (c) 2024 Nordic Semiconductor ASA
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
CONFIG_BOOT_MAX_IMG_SECTORS=256
6+
7+
# Ensure that the SPI NOR driver is disabled by default
8+
CONFIG_SPI_NOR=n
9+
10+
CONFIG_BOOT_WATCHDOG_FEED=n
11+
12+
# Ensure the fastest RRAM write operations
13+
CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE=32
14+
115
# Link Time Optimizations
216
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
317
CONFIG_LTO=y

0 commit comments

Comments
 (0)