Attention is currently required from: Jérémy Compostella.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84048?usp=email )
Change subject: arch/x86/car.ld: Fix overlapping regions ......................................................................
arch/x86/car.ld: Fix overlapping regions
Make sure .car.data and .car.fspm_rc_heap don't overlap. Clang with LLD does not like this.
Change-Id: I058bd6790afc313e06f1888e5b783d97b7e93b1e Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/arch/x86/car.ld 1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/84048/1
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld index f99304f..4c869df 100644 --- a/src/arch/x86/car.ld +++ b/src/arch/x86/car.ld @@ -5,10 +5,9 @@ #include <memlayout.h>
/* This file is included inside a SECTIONS block */ -. = CONFIG_DCACHE_RAM_BASE; +. = CONFIG_DCACHE_RAM_BASE + CONFIG_FSP_M_RC_HEAP_SIZE; .car.data . (NOLOAD) : { _car_region_start = . ; - . += CONFIG_FSP_M_RC_HEAP_SIZE; #if CONFIG(FSP_SPEC_VIOLATION_XEON_SP_HEAP_WORKAROUND) REGION(fspm_heap, ., CONFIG_FSP_TEMP_RAM_SIZE, 16) #endif @@ -113,8 +112,7 @@ _car_region_end = . + CONFIG_DCACHE_RAM_SIZE - (. - _car_region_start) - CONFIG_FSP_T_RESERVED_SIZE;
-. = _car_region_start; -.car.fspm_rc_heap . (NOLOAD) : { +.car.fspm_rc_heap (CONFIG_DCACHE_RAM_BASE) (NOLOAD) : { . += CONFIG_FSP_M_RC_HEAP_SIZE; }