> Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
> method.
> Signed-off-by: Adam Ford <aford...@gmail.com>
> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> index 5b5f3eb7b4..9a1596c89b 100644
> --- 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 396f321699..961be13399 100644
> --- 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 b38b6fd75a..41fb0341b9 100644
> --- 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 c6106c5d23..c5e6a29e47 100644
> --- 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 fe557f91ca..9db9668703 100644
> --- 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; " \
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
