ARM: omap3_logic: Enable UUID

Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
method.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index 5b5f3eb7b47f358288f3d31c1e148c3a8034463f..9a1596c89b44afcf699bfd0ab98b500848251d09 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 396f3216995930dff07b6fcf5c5d006a76c6f62d..961be133994470ad8c90cfc53c8f8e358054eb3b 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index b38b6fd75a88a3949011a6929e37eefd32296e06..41fb0341b957a194835f3c470d6d3581a38a469c 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index c6106c5d23a867e88a9743db67353fe7134f88c3..c5e6a29e47e61555d5ca55f6138f02a072f53c26 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_UUID=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index fe557f91caa7fb93f9c97d473c023cc3241a8db2..9db9668703a0b0700a1325d1195ce6305bf49539 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -67,7 +67,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" \
@@ -106,7 +106,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" \
@@ -120,6 +121,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; " \