summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2015-08-28 13:35:08 +0530
committerTom Rini <trini@konsulko.com>2015-09-11 14:05:38 -0400
commit437bc42e7ff930dc4d4bd47199d2e823cf84bf4c (patch)
treeeea7f161f9cc04a6e3a08c464625964738f41db7
parent85d17be374678ec37fd1e55db994a942e400dc80 (diff)
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 <yan-liu@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
-rw-r--r--include/configs/ti_armv7_common.h5
1 files 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"
/*