Change in ...coreboot[master]: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32385

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/32385/1

diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 37fb087..322ee3d 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 = .;

[Arthur Heymans (Code Review)]

Hello Kyösti Mälkki, Julius Werner, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/32385

to look at the new patch set (#2).

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/32385/2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32385 )

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

Patch Set 2:

Do we still need the sandy/ivy Kconfig separation for some purpose?

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32385 )

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

Patch Set 2:
> Patch Set 2:
>
> Do we still need the sandy/ivy Kconfig separation for some purpose?

Libgfxinit currently uses the distinction.

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32385 )

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

Patch Set 2: Code-Review+2

We can remove the separation once https://review.coreboot.org/#/q/topic:dyncpu_config+(status:open+OR+status:m...) is landed.

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32385 )

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

Patch Set 2: Code-Review+2

[Arthur Heymans (Code Review)]

Arthur Heymans has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32385 )

Change subject: arch/x86/car.ld: Also check mrc.bin heap for Ivybridge
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32385
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
Reviewed-by: Kyösti Mälkki 
---
M src/arch/x86/car.ld
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Patrick Rudolph: Looks good to me, approved

diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 37fb087..d97df19 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 = .;