arm: dts: stm32: Add partitions in flash0 and nand node for stm32mp15xx-dhcom/dhcor

Add partitions subnode in flash0 for stm32mp157xx-dhcom/dhcor boards.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
index bc0730cf2bd0af225d1f4bf55f116593a82323a0..a808620e1219314aeb92291e9b799d96d111187d 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
@@ -92,6 +92,33 @@
 
 &flash0 {
        bootph-pre-ram;
+
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partition@0 {
+                       label = "fsbl1";
+                       reg = <0x00000000 0x00040000>;
+               };
+               partition@40000 {
+                       label = "fsbl2";
+                       reg = <0x00040000 0x00040000>;
+               };
+               partition@500000 {
+                       label = "uboot";
+                       reg = <0x00080000 0x00160000>;
+               };
+               partition@900000 {
+                       label = "env1";
+                       reg = <0x001E0000 0x00010000>;
+               };
+               partition@980000 {
+                       label = "env2";
+                       reg = <0x001F0000 0x00010000>;
+               };
+       };
 };
 
 &qspi {

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index 804c66283e0809f9ab8fe6b6a8373457a4f1163a..eb905ad28201424b2e76781f547cfd3ce0d92a62 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
@@ -28,6 +28,33 @@
 
 &flash0 {
        bootph-pre-ram;
+
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partition@0 {
+                       label = "fsbl1";
+                       reg = <0x00000000 0x00040000>;
+               };
+               partition@40000 {
+                       label = "fsbl2";
+                       reg = <0x00040000 0x00040000>;
+               };
+               partition@500000 {
+                       label = "uboot";
+                       reg = <0x00080000 0x00160000>;
+               };
+               partition@900000 {
+                       label = "env1";
+                       reg = <0x001E0000 0x00010000>;
+               };
+               partition@980000 {
+                       label = "env2";
+                       reg = <0x001F0000 0x00010000>;
+               };
+       };
 };
 
 &i2c4 {

diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index 430d0bccc9a7140b7718f94677ad202c7dfdfc7b..77f0fafc5c710eab8fce80f52c1242a0e8807167 100644 (file)
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -85,9 +85,6 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_BTRFS=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nor0=nor0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set

diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index f23875fb84fe9903a8ca73f609685b396387cf6b..4151ad64a4bef2dbc98bb67c4bd6640b1f0bc2bf 100644 (file)
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -83,9 +83,6 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_BTRFS=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nor0=nor0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set