From 4ae054068a91ba13c05c39f01d4a43a28146949d Mon Sep 17 00:00:00 2001 From: David Imhoff Date: Sun, 10 May 2015 15:19:04 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/10165 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- 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 640331bf41..108568276c 100644 --- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c +++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c @@ -116,9 +116,10 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U UPD_DEFAULT_CHECK(AutoSelfRefreshEnable); UPD_DEFAULT_CHECK(APTaskTimeoutCnt); - 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;