Skip to content

Commit ed97cd7

Browse files
travis3630nordicjm
authored andcommitted
dts: common: nordic: add mramc nrf7120_enga.dtsi
add mram-controller node as wrapper for mram, sysbuild build nvs controller to mram_controller for nrf7120. Signed-off-by: Travis Lam <[email protected]>
1 parent 0dacdb0 commit ed97cd7

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

cmake/sysbuild/partition_manager.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,13 @@ foreach(d APP ${PM_DOMAINS})
523523
endif()
524524

525525
sysbuild_get(${image_name}_CONFIG_SOC_SERIES_NRF54LX IMAGE ${image_name} VAR CONFIG_SOC_SERIES_NRF54LX KCONFIG)
526+
sysbuild_get(${image_name}_CONFIG_SOC_SERIES_NRF71X IMAGE ${image_name} VAR CONFIG_SOC_SERIES_NRF71X KCONFIG)
526527
if(${image_name}_CONFIG_SOC_SERIES_NRF54LX)
527528
set(soc_nvs_controller rram_controller)
528529
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_RRAM)
530+
elseif(${image_name}_CONFIG_SOC_SERIES_NRF71X)
531+
set(soc_nvs_controller mram_controller)
532+
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_MRAMC)
529533
else()
530534
set(soc_nvs_controller flash_controller)
531535
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF)

dts/common/nordic/nrf7120_enga.dtsi

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@
125125
};
126126
#endif
127127

128-
cpuapp_mram: mram@0 {
129-
compatible = "nordic,mram";
130-
reg = <0 DT_SIZE_K(3972)>;
131-
erase-block-size = <4096>;
132-
write-block-size = <4>;
133-
};
134-
135-
cpuflpr_mram: mram@3e1000 {
136-
compatible = "nordic,mram";
137-
reg = <0x3e1000 DT_SIZE_K(116)>;
138-
erase-block-size = <4096>;
139-
write-block-size = <4>;
140-
};
141-
142128
cpuapp_sram: memory@20000000 {
143129
compatible = "mmio-sram";
144130
reg = <0x20000000 DT_SIZE_K(512)>;
@@ -826,6 +812,28 @@
826812
status = "disabled";
827813
};
828814

815+
mram_controller: mram-controller@0x5004e000 {
816+
compatible = "nordic,mram-controller";
817+
reg = <0x5004e000 0x1000>;
818+
#address-cells = <1>;
819+
#size-cells = <1>;
820+
interrupts = <78 NRF_DEFAULT_IRQ_PRIORITY>;
821+
822+
cpuapp_mram: mram@0 {
823+
compatible = "nordic,mram";
824+
reg = <0 DT_SIZE_K(3972)>;
825+
erase-block-size = <4096>;
826+
write-block-size = <4>;
827+
};
828+
829+
cpuflpr_mram: mram@3e1000 {
830+
compatible = "nordic,mram";
831+
reg = <0x3e1000 DT_SIZE_K(116)>;
832+
erase-block-size = <4096>;
833+
write-block-size = <4>;
834+
};
835+
};
836+
829837
cpuapp_ppb: cpuapp-ppb-bus {
830838
#address-cells = <1>;
831839
#size-cells = <1>;

0 commit comments

Comments
 (0)