diff options
| author | David Imhoff <dimhoff_devel@xs4all.nl> | 2015-05-10 15:19:04 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-11-16 18:23:11 +0100 |
| commit | 4ae054068a91ba13c05c39f01d4a43a28146949d (patch) | |
| tree | 65c37e0ec016147e13a1c178cfb33331be258c3c | |
| parent | 24f5164a261f31959fa44344b60024726fb1f597 (diff) | |
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 <dimhoff_devel@xs4all.nl>
Reviewed-on: https://review.coreboot.org/10165
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 7 |
1 files 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; |