Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / omap3_logic.h

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 2423dfa..e318a9f 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -65,7 +65,7 @@
        "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"    \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "mmcdev=0\0" \
-       "mmcroot=/dev/mmcblk0p2 rw\0" \
+       "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "mmcrootfstype=ext4 rootwait\0" \
        "nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \
        "nandrootfstype=ubifs rootwait\0" \
@@ -104,7 +104,8 @@
        "ramargs=setenv bootargs "\
                "root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \
        "mmcargs=setenv bootargs "\
-               "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
+               "root=PARTUUID=${uuid} " \
+               "rootfstype=${mmcrootfstype} rw\0" \
        "nandargs=setenv bootargs "\
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
@@ -118,6 +119,7 @@
        "loadfdt=mmc rescan; " \
                "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
        "mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \
+               "run finduuid; "\
                "run mmcargs; " \
                "run common_bootargs; " \
                "run dump_bootargs; " \