From 437bc42e7ff930dc4d4bd47199d2e823cf84bf4c Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Fri, 28 Aug 2015 13:35:08 +0530 Subject: [PATCH] ti_armv7_common: env: Use partuuid for detecting mmc root fs Linux kernel can enumerate mmc sd as either mmcblk0 or mmcblk1. But u-boot default environment assumes that sd always populates as mmcblk0. With this the root fs is not being mounted when mmc sd is enumerated as mmcblk1. So use partuuid to update root= option in default environment. Reported-by: Yan Liu Signed-off-by: Lokesh Vutla --- include/configs/ti_armv7_common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 1a4b6d9900..6dc6515899 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -61,9 +61,10 @@ #define DEFAULT_MMC_TI_ARGS \ "mmcdev=0\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "args_mmc=setenv bootargs console=${console} " \ + "finduuid=part uuid mmc 0:2 uuid\0" \ + "args_mmc=run finduuid;setenv bootargs console=${console} " \ "${optargs} " \ - "root=${mmcroot} " \ + "root=PARTUUID=${uuid} rw " \ "rootfstype=${mmcrootfstype}\0" /* -- 2.25.1