[PATCH] board: stm32mp1: no MTD partitions fixup for serial boot

[PATCH] board: stm32mp1: no MTD partitions fixup for serial boot

[Patrick Delaunay]

Remove the update of the MTD partitions in kernel device tree
for serial boot (USB / UART), and the kernel will use the MTD
partitions define in the loaded DTB because U-Boot can't known the
expected flash layout in this case.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

 board/st/stm32mp1/stm32mp1.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 03a19af930..8a3ce0a6f5 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -848,9 +848,14 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 		{ "st,stm32mp15-fmc2",		MTD_DEV_TYPE_NAND, },
 		{ "st,stm32mp1-fmc2-nfc",	MTD_DEV_TYPE_NAND, },
 	};
-
-	if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
-		fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+	char *boot_device;
+
+	/* Check the boot-source and don't update MTD for serial or usb boot */
+	boot_device = env_get("boot_device");
+	if (!boot_device ||
+	    (strcmp(boot_device, "serial") && strcmp(boot_device, "usb")))
+		if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
+			fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
 
 	return 0;
 }
-- 
2.17.1

[Uboot-stm32] [PATCH] board: stm32mp1: no MTD partitions fixup for serial boot

[Patrice CHOTARD]

Hi Patrick

On 10/15/20 2:52 PM, Patrick Delaunay wrote:
> Remove the update of the MTD partitions in kernel device tree
> for serial boot (USB / UART), and the kernel will use the MTD
> partitions define in the loaded DTB because U-Boot can't known the
> expected flash layout in this case.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
>  board/st/stm32mp1/stm32mp1.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index 03a19af930..8a3ce0a6f5 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -848,9 +848,14 @@ int ft_board_setup(void *blob, struct bd_info *bd)
>  		{ "st,stm32mp15-fmc2",		MTD_DEV_TYPE_NAND, },
>  		{ "st,stm32mp1-fmc2-nfc",	MTD_DEV_TYPE_NAND, },
>  	};
> -
> -	if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
> -		fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
> +	char *boot_device;
> +
> +	/* Check the boot-source and don't update MTD for serial or usb boot */
> +	boot_device = env_get("boot_device");
> +	if (!boot_device ||
> +	    (strcmp(boot_device, "serial") && strcmp(boot_device, "usb")))
> +		if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
> +			fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
>  
>  	return 0;
>  }

Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Thanks

[PATCH] board: stm32mp1: no MTD partitions fixup for serial boot

[Patrick DELAUNAY]

Hi,

> From: Patrick DELAUNAY <patrick.delaunay@st.com>
> Sent: jeudi 15 octobre 2020 14:53
> 
> Remove the update of the MTD partitions in kernel device tree for serial boot
> (USB / UART), and the kernel will use the MTD partitions define in the loaded DTB
> because U-Boot can't known the expected flash layout in this case.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
> 
>  board/st/stm32mp1/stm32mp1.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 

Applied to u-boot-stm/master, thanks!

Regards

Patrick