From c94ba798d6f3aa3bf49f6d00d7bb18a4cc00268f Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Mon, 22 Apr 2019 00:25:05 +0200
Subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/arch/x86/car.ld | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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 = .;
-- 
cgit v1.2.3