From 31cd065df01caefadcdec4f1c568f89f15406a53 Mon Sep 17 00:00:00 2001 From: Tom Rini <trini@ti.com> Date: Tue, 8 Oct 2013 11:09:17 -0400 Subject: [PATCH] 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> --- include/configs/am335x_evm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index e8e5275463..f746e48548 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;" -- 2.39.5