From: Simon Glass <sjg@chromium.org>
Date: Mon, 24 Apr 2017 02:02:04 +0000 (-0600)
Subject: dm: mmc: Don't re-init when accessing environment
X-Git-Tag: v2017.07-rc1~174
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e7017a3c7d2f9ff845516675205c99df4ad6eacc;p=oweals%2Fu-boot.git

dm: mmc: Don't re-init when accessing environment

With driver model MMC is probed automatically when needed. We should not
re-init MMC each time.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/env_mmc.c b/common/env_mmc.c
index 45d95a1e23..404de85062 100644
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -121,9 +121,10 @@ static const char *init_mmc_for_env(struct mmc *mmc)
 	if (!mmc)
 		return "!No MMC card found";
 
+#ifndef CONFIG_BLK
 	if (mmc_init(mmc))
 		return "!MMC init failed";
-
+#endif
 	if (mmc_set_env_part(mmc))
 		return "!MMC partition switch failed";