fsp_baytrail: remove register option for TSEG size

Set the UPD entry based on the Kconfig value instead of having two
separate places that the value needs to be set.

Change-Id: I3d32111b59152d0a8fc49e15320c7b5a140228a6
Signed-off-by: Martin Roth <martin.roth@se-eng.com>
Reviewed-on: http://review.coreboot.org/7490
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-by: FEI WANG <wangfei.jimei@gmail.com>
This commit is contained in:
Martin Roth 2014-11-16 20:28:57 -07:00 committed by Martin Roth
parent bdfe98f92f
commit 30eda3edd7
4 changed files with 2 additions and 18 deletions

View File

@ -27,7 +27,6 @@ chip soc/intel/fsp_baytrail
register "PcdSataMode" = "SATA_MODE_AHCI" register "PcdSataMode" = "SATA_MODE_AHCI"
register "PcdMrcInitSPDAddr1" = "SPD_ADDR_DEFAULT" register "PcdMrcInitSPDAddr1" = "SPD_ADDR_DEFAULT"
register "PcdMrcInitSPDAddr2" = "SPD_ADDR_DEFAULT" register "PcdMrcInitSPDAddr2" = "SPD_ADDR_DEFAULT"
register "PcdMrcInitTsegSize" = "TSEG_SIZE_8_MB"
register "PcdMrcInitMmioSize" = "MMIO_SIZE_DEFAULT" register "PcdMrcInitMmioSize" = "MMIO_SIZE_DEFAULT"
register "PcdeMMCBootMode" = "EMMC_FOLLOWS_DEVICETREE" register "PcdeMMCBootMode" = "EMMC_FOLLOWS_DEVICETREE"
register "PcdIgdDvmt50PreAlloc" = "IGD_MEMSIZE_DEFAULT" register "PcdIgdDvmt50PreAlloc" = "IGD_MEMSIZE_DEFAULT"

View File

@ -28,7 +28,6 @@ chip soc/intel/fsp_baytrail
register "PcdSataMode" = "SATA_MODE_AHCI" register "PcdSataMode" = "SATA_MODE_AHCI"
register "PcdMrcInitSPDAddr1" = "SPD_ADDR_DEFAULT" register "PcdMrcInitSPDAddr1" = "SPD_ADDR_DEFAULT"
register "PcdMrcInitSPDAddr2" = "SPD_ADDR_DEFAULT" register "PcdMrcInitSPDAddr2" = "SPD_ADDR_DEFAULT"
register "PcdMrcInitTsegSize" = "TSEG_SIZE_8_MB"
register "PcdMrcInitMmioSize" = "MMIO_SIZE_DEFAULT" register "PcdMrcInitMmioSize" = "MMIO_SIZE_DEFAULT"
register "PcdeMMCBootMode" = "EMMC_FOLLOWS_DEVICETREE" register "PcdeMMCBootMode" = "EMMC_FOLLOWS_DEVICETREE"
register "PcdIgdDvmt50PreAlloc" = "IGD_MEMSIZE_DEFAULT" register "PcdIgdDvmt50PreAlloc" = "IGD_MEMSIZE_DEFAULT"

View File

@ -51,20 +51,6 @@ struct soc_intel_fsp_baytrail_config {
#define SATA_MODE_IDE INCREMENT_FOR_DEFAULT(0) #define SATA_MODE_IDE INCREMENT_FOR_DEFAULT(0)
#define SATA_MODE_AHCI INCREMENT_FOR_DEFAULT(1) #define SATA_MODE_AHCI INCREMENT_FOR_DEFAULT(1)
/*
* MrcInitTsegSize
* 0x01, "1 MB"
* 0x02, "2 MB"
* 0x04, "4 MB"
* 0x08, "8 MB"
*/
uint16_t PcdMrcInitTsegSize;
#define TSEG_SIZE_DEFAULT UPD_DEFAULT
#define TSEG_SIZE_1_MB INCREMENT_FOR_DEFAULT(1)
#define TSEG_SIZE_2_MB INCREMENT_FOR_DEFAULT(2)
#define TSEG_SIZE_4_MB INCREMENT_FOR_DEFAULT(4)
#define TSEG_SIZE_8_MB INCREMENT_FOR_DEFAULT(8)
/* /*
* MrcInitMmioSize * MrcInitMmioSize
* 0x400, "1.0 GB"s * 0x400, "1.0 GB"s

View File

@ -33,6 +33,7 @@
#include <baytrail/pmc.h> #include <baytrail/pmc.h>
#include <baytrail/acpi.h> #include <baytrail/acpi.h>
#include <baytrail/iomap.h> #include <baytrail/iomap.h>
#include <baytrail/smm.h>
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
#include <baytrail/romstage.h> #include <baytrail/romstage.h>
@ -116,8 +117,7 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U
(config->PcdeMMCBootMode != EMMC_FOLLOWS_DEVICETREE)) (config->PcdeMMCBootMode != EMMC_FOLLOWS_DEVICETREE))
UpdData->PcdeMMCBootMode = config->PcdeMMCBootMode; UpdData->PcdeMMCBootMode = config->PcdeMMCBootMode;
if (config->PcdMrcInitTsegSize != TSEG_SIZE_DEFAULT) UpdData->PcdMrcInitTsegSize = smm_region_size() >> 20;
UpdData->PcdMrcInitTsegSize = config->PcdMrcInitTsegSize - 1;
printk(FSP_INFO_LEVEL, "GTT Size:\t\t%d MB\n", UpdData->PcdGttSize); printk(FSP_INFO_LEVEL, "GTT Size:\t\t%d MB\n", UpdData->PcdGttSize);
printk(FSP_INFO_LEVEL, "Tseg Size:\t\t%d MB\n", UpdData->PcdMrcInitTsegSize); printk(FSP_INFO_LEVEL, "Tseg Size:\t\t%d MB\n", UpdData->PcdMrcInitTsegSize);