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

[Patrice CHOTARD]

On 6/8/23 17:16, Patrick Delaunay wrote:
> Add partitions subnode in flash0 for stm32mp157xx-dhcom/dhcor boards.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 27 ++++++++++++++++++++++
>  arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 27 ++++++++++++++++++++++
>  configs/stm32mp15_dhcom_basic_defconfig    |  3 ---
>  configs/stm32mp15_dhcor_basic_defconfig    |  3 ---
>  4 files changed, 54 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
> index bc0730cf2bd0..a808620e1219 100644
> --- 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 at 0 {
> +			label = "fsbl1";
> +			reg = <0x00000000 0x00040000>;
> +		};
> +		partition at 40000 {
> +			label = "fsbl2";
> +			reg = <0x00040000 0x00040000>;
> +		};
> +		partition at 500000 {
> +			label = "uboot";
> +			reg = <0x00080000 0x00160000>;
> +		};
> +		partition at 900000 {
> +			label = "env1";
> +			reg = <0x001E0000 0x00010000>;
> +		};
> +		partition at 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 804c66283e08..eb905ad28201 100644
> --- 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 at 0 {
> +			label = "fsbl1";
> +			reg = <0x00000000 0x00040000>;
> +		};
> +		partition at 40000 {
> +			label = "fsbl2";
> +			reg = <0x00040000 0x00040000>;
> +		};
> +		partition at 500000 {
> +			label = "uboot";
> +			reg = <0x00080000 0x00160000>;
> +		};
> +		partition at 900000 {
> +			label = "env1";
> +			reg = <0x001E0000 0x00010000>;
> +		};
> +		partition at 980000 {
> +			label = "env2";
> +			reg = <0x001F0000 0x00010000>;
> +		};
> +	};
>  };
>  
>  &i2c4 {
> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
> index 430d0bccc9a7..77f0fafc5c71 100644
> --- 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 f23875fb84fe..4151ad64a4be 100644
> --- 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
Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice