summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-04-22 00:25:05 +0200
committerArthur Heymans <arthur@aheymans.xyz>2019-04-22 13:40:14 +0000
commitc94ba798d6f3aa3bf49f6d00d7bb18a4cc00268f (patch)
treec3203fa32b6cb1daf421ad44d312a0c55583e29d
parent1db39a44661f57c2ffe0d795e21c0a4d5dddb494 (diff)
arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
Sandy- and ivybridge use the same mrc.bin that has the heap in an awkward location. Change-Id: If985a48c6703c8a86d8051e67595cf0fd409d99a Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32385 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/arch/x86/car.ld3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 37fb087ebd..d97df19a37 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -89,7 +89,8 @@
_car_global_end = .;
_car_relocatable_data_end = .;
-#if CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) && \
+#if (CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) || \
+ CONFIG(NORTHBRIDGE_INTEL_IVYBRIDGE)) && \
!CONFIG(USE_NATIVE_RAMINIT)
. = ABSOLUTE(0xff7e1000);
_mrc_pool = .;