[PATCH v2 3/3] colibri-imx6ull: specify MTD partitions on command line

[Dario Binacchi]

> From: Francesco Dolcini <francesco.dolcini at toradex.com>

> Disable fdt_fixup_mtdparts() and pass MTD partition on the command
> line. Dynamically editing the fdt with a static partitions configuration
> is not required and there is no advantages compared to using the command
> line. This change should prevent boot failures as the one in [0].

> Cc: Marek Vasut <marex at denx.de>
> Cc: Miquel Raynal <miquel.raynal at bootlin.com>
> Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ [0]
> Link: https://lore.kernel.org/all/20230105123334.7f90c289@xps-13/
> Signed-off-by: Francesco Dolcini <francesco.dolcini at toradex.com>
> ---
> v2:
>  - removed dead code
>  - improved commit message
> ---
>  board/toradex/colibri-imx6ull/colibri-imx6ull.c | 11 -----------
>  configs/colibri-imx6ull_defconfig               |  1 -
>  include/configs/colibri-imx6ull.h               |  2 +-
>  3 files changed, 1 insertion(+), 13 deletions(-)

> diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
> index 6007f110e4ba..48fdb1e09712 100644
> --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
> +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
> @@ -212,17 +212,6 @@ int checkboard(void)
>  #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
>  int ft_board_setup(void *blob, struct bd_info *bd)
>  {
> -#if defined(CONFIG_FDT_FIXUP_PARTITIONS)
> -	static struct node_info nodes[] = {
> -		{ "fsl,imx6ull-gpmi-nand", MTD_DEV_TYPE_NAND, },
> -		{ "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, },
> -	};
> -
> -	/* Update partition nodes using info from mtdparts env var */
> -	puts("   Updating MTD partitions...\n");
> -	fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
> -#endif
> -
>  	return ft_common_board_setup(blob, bd);
>  }
>  #endif
> diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
> index f2a0d79ccca9..fbab687f5ab8 100644
> --- a/configs/colibri-imx6ull_defconfig
> +++ b/configs/colibri-imx6ull_defconfig
> @@ -104,4 +104,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_FDT_FIXUP_PARTITIONS=y
> diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
> index ba45ee4efd37..561a61ebc03c 100644
> --- a/include/configs/colibri-imx6ull.h
> +++ b/include/configs/colibri-imx6ull.h
> @@ -99,7 +99,7 @@
>  		"${board}/flash_blk.img && source ${loadaddr}\0" \
>  	"setup=setenv setupargs " \
>  		"console=tty1 console=${console}" \
> -		",${baudrate}n8 ${memargs} consoleblank=0\0" \
> +		",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \
>  	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
>  	"setusbupdate=usb start && setenv interface usb && " \
>  		"fatload ${interface} 0:1 ${loadaddr} " \
> -- 
> 2.25.1

Applied to nand-next,
thanks and regards,

Dario Binacchi