Skip to content

[Backport v4.0.99-ncs1-branch] suit: Move to the new flash driver #21734

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 15, 2025
Merged

[Backport v4.0.99-ncs1-branch] suit: Move to the new flash driver #21734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,48 +53,6 @@
};
};

/* Legacy exmif driver overlay - currently needed for DFU from extmem */

/delete-node/ &exmif;

&global_peripherals {
exmif: spi@95000 {
compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
pinctrl-0 = <&exmif_default>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x95000 0x500 0x95500 0xb00>;
reg-names = "wrapper", "core";
interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
clock-frequency = <DT_FREQ_M(400)>;
fifo-depth = <32>;
max-xfer-size = <16>;
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
};
};

&exmif {
mx25uw63: mx25uw6345g@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <DT_FREQ_M(48)>;
jedec-id = [c2 84 37];
sfdp-bfp = [
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8
00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46
30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20
00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88
];
size = <67108864>;
has-dpd;
t-enter-dpd = <10000>;
t-exit-dpd = <30000>;
};
};

&mx25uw63 {
status = "okay";
};
7 changes: 7 additions & 0 deletions samples/suit/flash_companion/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ CONFIG_NUM_COOP_PRIORITIES=16
CONFIG_NUM_METAIRQ_PRIORITIES=0
CONFIG_SCHED_DUMB=y
CONFIG_WAITQ_DUMB=y
CONFIG_TICKLESS_KERNEL=n
CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=n

# Enable peripherals needed by the flash companion firmware
CONFIG_GPIO=y
Expand Down Expand Up @@ -45,6 +47,7 @@ CONFIG_NCS_BOOT_BANNER=n
CONFIG_BOOT_DELAY=0

# Disable serial communication
CONFIG_SERIAL=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
CONFIG_STDOUT_CONSOLE=n
Expand Down Expand Up @@ -78,3 +81,7 @@ CONFIG_CLOCK_CONTROL=n
# Set flash base address to zero to ensure that the executable
# code is placed in CPUAPP RAM by the linker.
CONFIG_FLASH_BASE_ADDRESS=0x0
CONFIG_COMMON_LIBC_MALLOC=n
CONFIG_COMMON_LIBC_CALLOC=n
CONFIG_COMMON_LIBC_REALLOCARRAY=n
CONFIG_PICOLIBC_IO_LONG_LONG=n
51 changes: 0 additions & 51 deletions samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,6 @@
};
};

/* Legacy exmif driver overlay - currently needed for DFU from extmem */

&exmif_default {
group1 {
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
nordic,drive-mode = <NRF_DRIVE_H0H1>;
};
};

/delete-node/ &exmif;

&global_peripherals {
exmif: spi@95000 {
compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
pinctrl-0 = <&exmif_default>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x95000 0x500 0x95500 0xb00>;
reg-names = "wrapper", "core";
interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
clock-frequency = <DT_FREQ_M(400)>;
fifo-depth = <32>;
max-xfer-size = <16>;
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
};
};

&exmif {
mx25uw63: mx25uw6345g@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <DT_FREQ_M(48)>;
jedec-id = [c2 84 37];
sfdp-bfp = [
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
ee ff ff ff ff ff 00 ff ff ff 00 ff 0c 20 10 d8
00 ff 00 ff 87 79 01 00 84 12 00 c4 cc 04 67 46
30 b0 30 b0 f4 bd d5 5c 00 00 00 ff 10 10 00 20
00 00 00 00 00 00 7c 23 48 00 00 00 00 00 88 88
];
size = <67108864>;
has-dpd;
t-enter-dpd = <10000>;
t-exit-dpd = <30000>;
};
};

&mx25uw63 {
status = "okay";
partitions {
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 9018ae510c046e98478cfc74ddcea21bd56e3cd9
revision: 1d7723ad7b3e70b9b5ab1fb85d955c527cc0fa33
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading