From: Peter Bigot <pab@pabigot.com>
Date: Wed, 3 Sep 2014 17:22:43 +0000 (-0500)
Subject: env_mmc: correct fini partition to match init partition
X-Git-Tag: v2014.10-rc3~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19345d7c9483b84578da5206b3c604b534121d88;p=u-boot

env_mmc: correct fini partition to match init partition

The code to set the MMC partition uses an weak function to obtain the
correct partition number.  Use that instead of the compile-time default
when deciding whether it needs to switch back.

Fixes: 6e7b7df4df43574 ("env_mmc: support env partition setup in runtime")
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Acked-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
---

diff --git a/common/env_mmc.c b/common/env_mmc.c
index a7621a897c..14648e37bd 100644
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -113,7 +113,7 @@ static void fini_mmc_for_env(struct mmc *mmc)
 #ifdef CONFIG_SPL_BUILD
 	dev = 0;
 #endif
-	if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num)
+	if (mmc_get_env_part(mmc) != mmc->part_num)
 		mmc_switch_part(dev, mmc->part_num);
 #endif
 }