From bbbfbf2e0fe3c1af135a955505b6a2fd73681a8e Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 13 Jul 2015 16:55:28 -0500 Subject: intel fsp: remove CHIPSET_RESERVED_MEM_BYTES FSP 1.1 platforms should be conforming to the spec. In order to ensure following specification remove the crutch that allows FSP to no conform. BUG=chrome-os-partner:41961 BRANCH=None TEST=Built. Change-Id: I28b876773a3b6f07223d60a5133129d8f2c75bf6 Signed-off-by: Patrick Georgi Original-Commit-Id: c3fe08c5af41867782e422f27b0aed1b762ff34a Original-Change-Id: Ib97027a35cdb914aca1eec0eeb225a55f51a4b4b Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/285187 Original-Reviewed-by: Leroy P Leahy Original-Reviewed-by: Duncan Laurie Reviewed-on: http://review.coreboot.org/10993 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/soc/intel/skylake/memmap.c | 2 +- src/soc/intel/skylake/systemagent.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/soc/intel/skylake') diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c index f8ef01a6df..bba93cb2a1 100644 --- a/src/soc/intel/skylake/memmap.c +++ b/src/soc/intel/skylake/memmap.c @@ -96,6 +96,6 @@ void *cbmem_top(void) top_of_ram = ALIGN_DOWN(top_of_ram, mmap_region_granluarity()); } - return (void *)(top_of_ram - CONFIG_CHIPSET_RESERVED_MEM_BYTES); + return (void *)top_of_ram; } diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c index 2034e8e1f1..a1bcfdcf71 100644 --- a/src/soc/intel/skylake/systemagent.c +++ b/src/soc/intel/skylake/systemagent.c @@ -351,15 +351,12 @@ static void mc_add_dram_resources(device_t dev) base_k = 0xc0000 >> 10; size_k = (unsigned long)(mc_values[TSEG_REG] >> 10) - base_k; size_k -= dpr_size >> 10; - size_k -= CONFIG_CHIPSET_RESERVED_MEM_BYTES >> 10; ram_resource(dev, index++, base_k, size_k); /* TSEG - DPR -> BGSM */ resource = new_resource(dev, index++); resource->base = mc_values[TSEG_REG] - dpr_size; resource->size = mc_values[BGSM_REG] - resource->base; - resource->base -= CONFIG_CHIPSET_RESERVED_MEM_BYTES; - resource->size += CONFIG_CHIPSET_RESERVED_MEM_BYTES; resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_RESERVE | IORESOURCE_ASSIGNED | IORESOURCE_CACHEABLE; -- cgit v1.2.3