summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-10-08 11:09:17 -0400
committerTom Rini <trini@ti.com>2013-10-08 11:09:17 -0400
commit31cd065df01caefadcdec4f1c568f89f15406a53 (patch)
tree59cd0dfc9e088462e3b16d00c7c47d1ebd2171f5
parent9f3fe6da27e2328285aa37149fce845da4e57560 (diff)
downloadu-boot-imx-31cd065df01caefadcdec4f1c568f89f15406a53.zip
u-boot-imx-31cd065df01caefadcdec4f1c568f89f15406a53.tar.gz
u-boot-imx-31cd065df01caefadcdec4f1c568f89f15406a53.tar.bz2
Revert "am335x_evm.h: If mmcdev and bootpart switch to mmcdev 1, so should mmcroot."
Upon further inspection and review and chatting with kernel folks, what happens here is that what mmcblk# a device gets is based on probe order. So a system with an SD card inserted with place eMMC on mmcblk1, but without an SD card, it will be on mmcblk0. So U-boot can only provide a best guess. In this case, if no SD card is present, we would want to pass mmcblk0p2 still. If an SD card is present, it woudl be able to provide a uEnv.txt that would be loaded (even if the kernel is NOT there) which can still update mmcroot variable. This reverts commit 827512fb1154c05c6eb1e2259e936df55c98a535. Cc: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--include/configs/am335x_evm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index e8e5275..f746e48 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -171,7 +171,6 @@
"run mmcboot;" \
"setenv mmcdev 1; " \
"setenv bootpart 1:2; " \
- "setenv mmcroot /dev/mmcblk1p2 ro; " \
"run mmcboot;" \
"run nandboot;"