[U-Boot] [PATCH 2/5] colibri-imx6ull: use UUID for rootfs

[Marcel Ziswiler]

On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
> 
> Signed-off-by: Igor Opaniuk <igor.opaniuk at toradex.com>

Acked-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>

> ---
>  include/configs/colibri-imx6ull.h | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/include/configs/colibri-imx6ull.h
> b/include/configs/colibri-imx6ull.h
> index 7cf550cf9e..2ba0ce5b79 100644
> --- a/include/configs/colibri-imx6ull.h
> +++ b/include/configs/colibri-imx6ull.h
> @@ -66,12 +66,17 @@
>  		"run fdt_fixup && bootz ${kernel_addr_r} -
> ${fdt_addr_r}\0" \
>  
>  #define SD_BOOTCMD \
> -	"sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
> -	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
> +	"set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"
> \
> +	"sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> +	"setenv bootargs ${defargs} ${sdargs} " \
>  	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
> -	"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
> -	"load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \
> +	"load mmc ${sddev}:${sdbootpart} ${kernel_addr_r}
> ${kernel_file} && " \
> +	"load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " &&
> " \
>  	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
> +	"sdbootpart=1\0" \
> +	"sddev=0\0" \
> +	"sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> +	"sdrootpart=2\0"
>  
>  #define UBI_BOOTCMD \
>  	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \