Skip to content

Commit 1f61216

Browse files
committed
suit: Move to the new flash driver
Use the efficient, new extenal memory driver in SUIT DFU sample. Ref: NCSDK-32779 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent addfc90 commit 1f61216

File tree

4 files changed

+8
-94
lines changed

4 files changed

+8
-94
lines changed

samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -53,48 +53,6 @@
5353
};
5454
};
5555

56-
/* Legacy exmif driver overlay - currently needed for DFU from extmem */
57-
58-
/delete-node/ &exmif;
59-
60-
&global_peripherals {
61-
exmif: spi@95000 {
62-
compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
63-
pinctrl-0 = <&exmif_default>;
64-
pinctrl-names = "default";
65-
#address-cells = <1>;
66-
#size-cells = <0>;
67-
reg = <0x95000 0x500 0x95500 0xb00>;
68-
reg-names = "wrapper", "core";
69-
interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
70-
power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
71-
clock-frequency = <DT_FREQ_M(400)>;
72-
fifo-depth = <32>;
73-
max-xfer-size = <16>;
74-
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
75-
};
76-
};
77-
78-
&exmif {
79-
mx25uw63: mx25uw6345g@0 {
80-
compatible = "jedec,spi-nor";
81-
reg = <0>;
82-
spi-max-frequency = <DT_FREQ_M(48)>;
83-
jedec-id = [c2 84 37];
84-
sfdp-bfp = [
85-
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
86-
ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8
87-
00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46
88-
30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20
89-
00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88
90-
];
91-
size = <67108864>;
92-
has-dpd;
93-
t-enter-dpd = <10000>;
94-
t-exit-dpd = <30000>;
95-
};
96-
};
97-
9856
&mx25uw63 {
9957
status = "okay";
10058
};

samples/suit/flash_companion/prj.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ CONFIG_NUM_COOP_PRIORITIES=16
1111
CONFIG_NUM_METAIRQ_PRIORITIES=0
1212
CONFIG_SCHED_DUMB=y
1313
CONFIG_WAITQ_DUMB=y
14+
CONFIG_TICKLESS_KERNEL=n
15+
CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=n
1416

1517
# Enable peripherals needed by the flash companion firmware
1618
CONFIG_GPIO=y
@@ -45,6 +47,7 @@ CONFIG_NCS_BOOT_BANNER=n
4547
CONFIG_BOOT_DELAY=0
4648

4749
# Disable serial communication
50+
CONFIG_SERIAL=n
4851
CONFIG_CONSOLE=n
4952
CONFIG_UART_CONSOLE=n
5053
CONFIG_STDOUT_CONSOLE=n
@@ -78,3 +81,7 @@ CONFIG_CLOCK_CONTROL=n
7881
# Set flash base address to zero to ensure that the executable
7982
# code is placed in CPUAPP RAM by the linker.
8083
CONFIG_FLASH_BASE_ADDRESS=0x0
84+
CONFIG_COMMON_LIBC_MALLOC=n
85+
CONFIG_COMMON_LIBC_CALLOC=n
86+
CONFIG_COMMON_LIBC_REALLOCARRAY=n
87+
CONFIG_PICOLIBC_IO_LONG_LONG=n

samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,6 @@
1010
};
1111
};
1212

13-
/* Legacy exmif driver overlay - currently needed for DFU from extmem */
14-
15-
&exmif_default {
16-
group1 {
17-
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
18-
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
19-
<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
20-
nordic,drive-mode = <NRF_DRIVE_H0H1>;
21-
};
22-
};
23-
24-
/delete-node/ &exmif;
25-
26-
&global_peripherals {
27-
exmif: spi@95000 {
28-
compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
29-
pinctrl-0 = <&exmif_default>;
30-
pinctrl-names = "default";
31-
#address-cells = <1>;
32-
#size-cells = <0>;
33-
reg = <0x95000 0x500 0x95500 0xb00>;
34-
reg-names = "wrapper", "core";
35-
interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
36-
power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
37-
clock-frequency = <DT_FREQ_M(400)>;
38-
fifo-depth = <32>;
39-
max-xfer-size = <16>;
40-
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
41-
};
42-
};
43-
44-
&exmif {
45-
mx25uw63: mx25uw6345g@0 {
46-
compatible = "jedec,spi-nor";
47-
reg = <0>;
48-
spi-max-frequency = <DT_FREQ_M(48)>;
49-
jedec-id = [c2 84 37];
50-
sfdp-bfp = [
51-
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
52-
ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8
53-
00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46
54-
30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20
55-
00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88
56-
];
57-
size = <67108864>;
58-
has-dpd;
59-
t-enter-dpd = <10000>;
60-
t-exit-dpd = <30000>;
61-
};
62-
};
63-
6413
&mx25uw63 {
6514
status = "okay";
6615
partitions {

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: 7af92582ecab16df529fbb4d77aad92ccf105352
68+
revision: pull/2745/head
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)