[coreboot-gerrit] New patch to review for coreboot: 3f90e9d intel/fsp_baytrail: Fix assignment of PcdeMMCBootMode

[David Imhoff]

David Imhoff ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10165

-gerrit

commit 3f90e9d0d589348f01b6654f924f6bead89cffff
Author: David Imhoff 
Date:   Sun May 10 15:19:04 2015 +0200

intel/fsp_baytrail: Fix assignment of PcdeMMCBootMode

Before the PcdeMMCBootMode in the Updatable Product Date was always
    assigned and didn't take into account the + 1 increment for the default
    define.

Now if the configuration indicates that the device tree should be
    followed PcdeMMCBootMode is initially disabled. Else if configuration
    isn't the default, assign the value with the + 1 increment substracted.

TEST=Intel/MinnowMax

Change-Id: I6755eb585d1afe3a15f83347fba834766eb44ad2
    Signed-off-by: David Imhoff 
---
 src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index 1a3eda4..f7ca991 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -113,9 +113,10 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U
    UPD_DEFAULT_CHECK(IgdRenderStandby);
    UPD_DEFAULT_CHECK(TxeUmaEnable);

-	if ((config->PcdeMMCBootMode != EMMC_USE_DEFAULT) ||
-			(config->PcdeMMCBootMode != EMMC_FOLLOWS_DEVICETREE))
-		UpdData->PcdeMMCBootMode = config->PcdeMMCBootMode;
+	if (config->PcdeMMCBootMode == EMMC_FOLLOWS_DEVICETREE)
+		UpdData->PcdeMMCBootMode = 0;
+	else if ((config->PcdeMMCBootMode != EMMC_USE_DEFAULT))
+		UpdData->PcdeMMCBootMode = config->PcdeMMCBootMode - EMMC_DISABLED;

UpdData->PcdMrcInitTsegSize = smm_region_size() >> 20;