colibri_imx6: use UUID for rootfs

1. 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.
2. Fix legacy USB command (both sdboot and usbboot can be used now).

Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index bf05c688072abb0e5ce43290b92030743a1462c4..083588e02d2dcee1637cea19dc4c7f0360cb96e9 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -40,6 +40,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_UUID=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index fecea95d32b5a49d0756922419d770ad3c16ee0c..129a42466d45a5eaa297f040aaa8d83987b03843 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -115,16 +115,22 @@
        "imx6dl-colibri-cam-eval-v3.dtb fat 0 1"
 
 #define EMMC_BOOTCMD \
-       "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \
+       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} "\
+               "rw,noatime rootfstype=ext4 " \
                "rootwait\0" \
-       "emmcboot=run setup; " \
+       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
                "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
                "${vidargs}; echo Booting from internal eMMC chip...; " \
-               "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+       "emmcbootpart=1\0" \
+       "emmcdev=0\0" \
+       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${fdt_addr_r} ${fdt_file} && " \
+               "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
+       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+       "emmcrootpart=2\0"
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
@@ -147,27 +153,40 @@
                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
 #define SD_BOOTCMD \
-       "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \
-               "rootwait\0" \
-       "sdboot=run setup; " \
+       "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw,noatime " \
+               "rootfstype=ext4 rootwait\0" \
+       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
                "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
                "${vidargs}; echo Booting from SD card; " \
-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run sddtbload; load mmc ${sddev}:${sdbootpart} "\
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+       "sdbootpart=1\0" \
+       "sddev=1\0" \
+       "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
+               "${fdt_addr_r} ${fdt_file} && setenv dtbparam \" - " \
+               "${fdt_addr_r}\" && true\0" \
+       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+       "sdrootpart=2\0"
 
 #define USB_BOOTCMD \
-       "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext4 " \
-               "rootwait\0" \
-       "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
+       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
+               "rootfstype=ext4 rootwait\0" \
+       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
+               "setenv bootargs ${defargs} ${setupargs} " \
                "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
+               "run usbdtbload; " \
+               "load usb ${usbdev}:${usbbootpart} ${kernel_addr_r} " \
                "${boot_file} && run fdt_fixup && " \
                "bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+       "usbbootpart=1\0" \
+       "usbdev=0\0" \
+       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
+               "${fdt_addr_r} " \
+               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && " \
+               "true\0" \
+       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
+       "usbrootpart=2\0"
 
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -186,6 +205,7 @@
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
        SD_BOOTCMD \
+       USB_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \