boards: mimxrt1160_evk: Refactor flexspi partition definition
Flexspi partition definition is shared between both cm4 and cm7 core.
Refactor it to be in shared dtsi file. This will ensure that both cores
share the same partition information, for dual core operation.
Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
diff --git a/boards/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi b/boards/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi
index 7f4c511..4398c6d 100644
--- a/boards/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi
+++ b/boards/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi
@@ -81,6 +81,54 @@
};
};
+&flexspi {
+ status = "okay";
+ ahb-prefetch;
+ ahb-read-addr-opt;
+ rx-clock-source = <1>;
+ reg = <0x400cc000 0x4000>, <0x30000000 DT_SIZE_M(16)>;
+ is25wp128: is25wp128@0 {
+ compatible = "nxp,imx-flexspi-nor";
+ size = <134217728>;
+ reg = <0>;
+ spi-max-frequency = <133000000>;
+ status = "okay";
+ jedec-id = [9d 70 17];
+ erase-block-size = <4096>;
+ write-block-size = <1>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ boot_partition: partition@0 {
+ label = "mcuboot";
+ reg = <0x00000000 DT_SIZE_K(128)>;
+ };
+ /* Note slot 0 has one additional sector,
+ * this is intended for use with the swap move algorithm
+ */
+ slot0_partition: partition@20000 {
+ label = "image-0";
+ reg = <0x00020000 0x301000>;
+ };
+ slot1_partition: partition@321000 {
+ label = "image-1";
+ reg = <0x00321000 0x300000>;
+ };
+ scratch_partition: partition@621000 {
+ label = "image-scratch";
+ reg = <0x00621000 DT_SIZE_K(128)>;
+ };
+ storage_partition: partition@641000 {
+ label = "storage";
+ reg = <0x00641000 DT_SIZE_K(1856)>;
+ };
+ };
+ };
+};
+
&flexpwm1_pwm2 {
status = "okay";
pinctrl-0 = <&pinmux_flexpwm1>;
diff --git a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts
index 9cd8fd5..c80658e 100644
--- a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts
+++ b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts
@@ -45,52 +45,6 @@
status = "okay";
};
-&flexspi {
- status = "okay";
- ahb-prefetch;
- ahb-read-addr-opt;
- rx-clock-source = <1>;
- reg = <0x400cc000 0x4000>, <0x30000000 DT_SIZE_M(16)>;
- is25wp128: is25wp128@0 {
- compatible = "nxp,imx-flexspi-nor";
- size = <134217728>;
- reg = <0>;
- spi-max-frequency = <133000000>;
- status = "okay";
- jedec-id = [9d 70 17];
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- boot_partition: partition@0 {
- label = "mcuboot";
- reg = <0x00000000 DT_SIZE_K(128)>;
- };
- /* Note slot 0 has one additional sector,
- * this is intended for use with the swap move algorithm
- */
- slot0_partition: partition@20000 {
- label = "image-0";
- reg = <0x00020000 0x301000>;
- };
- slot1_partition: partition@321000 {
- label = "image-1";
- reg = <0x00321000 0x300000>;
- };
- scratch_partition: partition@621000 {
- label = "image-scratch";
- reg = <0x00621000 DT_SIZE_K(128)>;
- };
- storage_partition: partition@641000 {
- label = "storage";
- reg = <0x00641000 DT_SIZE_K(1856)>;
- };
- };
- };
-};
-
/* Enable GPT for use as a hardware timer. This disables Cortex Systick.
* to use systick, change this node from "gpt_hw_timer" to "systick"
*/
diff --git a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts
index d0d1b21..ee7bd63 100644
--- a/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts
+++ b/boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts
@@ -58,54 +58,6 @@
status = "okay";
};
-&flexspi {
- status = "okay";
- ahb-prefetch;
- ahb-read-addr-opt;
- rx-clock-source = <1>;
- reg = <0x400cc000 0x4000>, <0x30000000 DT_SIZE_M(16)>;
- is25wp128: is25wp128@0 {
- compatible = "nxp,imx-flexspi-nor";
- size = <134217728>;
- reg = <0>;
- spi-max-frequency = <133000000>;
- status = "okay";
- jedec-id = [9d 70 17];
- erase-block-size = <4096>;
- write-block-size = <1>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- boot_partition: partition@0 {
- label = "mcuboot";
- reg = <0x00000000 DT_SIZE_K(128)>;
- };
- /* Note slot 0 has one additional sector,
- * this is intended for use with the swap move algorithm
- */
- slot0_partition: partition@20000 {
- label = "image-0";
- reg = <0x00020000 0x301000>;
- };
- slot1_partition: partition@321000 {
- label = "image-1";
- reg = <0x00321000 0x300000>;
- };
- scratch_partition: partition@621000 {
- label = "image-scratch";
- reg = <0x00621000 DT_SIZE_K(128)>;
- };
- storage_partition: partition@641000 {
- label = "storage";
- reg = <0x00641000 DT_SIZE_K(1856)>;
- };
- };
- };
-};
-
/* Enable GPT for use as a hardware timer. This disables Cortex Systick.
* to use systick, change this node from "gpt_hw_timer" to "systick"
*/
